opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-29 17:58:36 +08:00
Code Issues Packages Projects Releases Wiki Activity
10,437 Commits 30 Branches 712 Tags
18fe12a4a7551331f68c82455152dfd2b32b025d
Commit Graph
617 Commits
Author SHA1 Message Date
Qiu Jian f43c278d90 guestdisk support index filter 2018-09-15 18:04:08 +08:00
zhengjiajie bff2fd4649 zhengjiajie modify code style 2018-09-15 17:24:59 +08:00
zhengjiajie b09e6da1fc zhengjiajie modify column items 2018-09-15 15:56:15 +08:00
屈轩 c60ca1d6eb resolve conflict 2018-09-15 14:07:45 +08:00
屈轩 c09a63442f Merge branch 'release/2.2.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-azure 2018-09-15 14:02:21 +08:00
zhengjiajie 71affd88f4 zhengjiajie submit resource result export 2018-09-14 12:17:17 +08:00
李泽玺 f922bc1b0d Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '5b74e3c8e60956682d043f833994dd4d2c9a5c43':
  climc: k8s options, code refactor
 2018-09-13 18:24:58 +08:00
李泽玺 5b74e3c8e6 Merge pull request #202 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-climc-k8s.v3 to release/2.1.0 
* commit 'f1fec1b49e2d57456f14a0f7f6db4ceec037a4e2':
  climc: k8s options, code refactor
 2018-09-13 18:24:57 +08:00
Zexi Li f1fec1b49e climc: k8s options, code refactor 2018-09-13 15:04:39 +08:00
TangBin 9b6b1a76a6 Merge branch 'release/2.2.0' into feature/tb-paramter-climc 2018-09-13 14:25:12 +08:00
邱剑 24751ec50a Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '329cf9aa5afa944ddacdebee004bafd3e4cdb610':
  修正：1. image更新时丢失properties属性 2. 虚拟机Get/List返回增加manager_id字段 3. 创建eip时候chargetype不生效
 2018-09-12 20:06:22 +08:00
wanyaoqi fb330c98be disk reset 
minor fixs
 2018-09-12 19:59:00 +08:00
Qiu Jian 860f6b8c02 修正：1. image更新时丢失properties属性 2. 虚拟机Get/List返回增加manager_id字段 3. 创建eip时候chargetype不生效 2018-09-12 18:22:50 +08:00
邱剑 3b6b0c3795 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'a1b67853de1238e0d8ce0a569c4d8214dedca934':
  mcclient: register WebConsole
  climc: support create resource from file, raw put body fix
 2018-09-11 21:56:07 +08:00
Zexi Li 32adce2d02 mcclient: register WebConsole 2018-09-11 15:39:59 +08:00
邱剑 a42cef6e77 Merge pull request #160 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/local-disk-snapshot to release/2.2.0 
* commit '5b5733916624792de9fe4c1aa438c0d320e80a4e':
  fix code
  - local disk snapshot create and delete - auto snapshot everyday - rewrite cornman - make dep and some fix - fix conflict
 2018-09-10 23:55:25 +08:00
Zexi Li eb3ff786a7 climc: support create resource from file, raw put body fix 2018-09-10 16:32:18 +08:00
邱剑 9eca9e0305 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '481a6a1ae6a668dba221ad748949661d271d4a9e':
  增加/capabilities接口，获取后端的总体能力信息，用于按需显示云端服务菜单
 2018-09-10 11:18:23 +08:00
邱剑 481a6a1ae6 Merge pull request #171 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-general-capabilities to release/2.1.0 
* commit '3c8ea2cddf8e586d280dac8849e7e50c0dabbb13':
  增加/capabilities接口，获取后端的总体能力信息，用于按需显示云端服务菜单
 2018-09-10 11:18:22 +08:00
李泽玺 6fd5bf3a8e Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '7798b928659004dbf4b6faa8c5c2391a7f5dc513':
  climc: k8s general raw resource GET, PUT, DELETE support
 2018-09-07 14:08:32 +08:00
李泽玺 7798b92865 Merge pull request #172 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-add-k8s-raw-res to release/2.1.0 
* commit '87d99fca2a0193168d2b1d3dcc35d84f677d07f2':
  climc: k8s general raw resource GET, PUT, DELETE support
 2018-09-07 14:08:31 +08:00
Zexi Li 87d99fca2a climc: k8s general raw resource GET, PUT, DELETE support 2018-09-07 13:22:37 +08:00
李泽玺 4dc815ce90 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'cbd159596b32073e75786562347e4aa2b1c7c86e':
  climc: k8s resource client api for nodes, namespace, statefulset, ingress
 2018-09-07 11:59:33 +08:00
李泽玺 cbd159596b Merge pull request #168 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-add-k8s-cli-v3 to release/2.1.0 
* commit 'd36f20d5c923b201ca7511ae015df73eadf84f33':
  climc: k8s resource client api for nodes, namespace, statefulset, ingress
 2018-09-07 11:59:32 +08:00
Qiu Jian 3c8ea2cddf 增加/capabilities接口，获取后端的总体能力信息，用于按需显示云端服务菜单 2018-09-07 11:42:37 +08:00
wanyaoqi 5b57339166 fix code 2018-09-06 20:30:08 +08:00
TangBin 53a7a35f4c temp!!withbugs 2018-09-06 20:08:32 +08:00
李泽玺 0732b80d05 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '62e269b20f3639fd21a9aeb986bbe89959aef60c':
  webconsole: support baremetal ipmitool sol
 2018-09-06 19:32:11 +08:00
李泽玺 62e269b20f Merge pull request #165 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feautre/lzx-webterm to release/2.1.0 
* commit '94a5eedae4bf55055873de3d2f6b329ec7452963':
  webconsole: support baremetal ipmitool sol
 2018-09-06 19:32:11 +08:00
Zexi Li d36f20d5c9 climc: k8s resource client api for nodes, namespace, statefulset, 
ingress
 2018-09-06 18:15:52 +08:00
wanyaoqi 4f2b50a869 - local disk snapshot create and delete 
- auto snapshot everyday
- rewrite cornman
- make dep and some fix
- fix conflict
 2018-09-06 16:22:36 +08:00
TangBin 5f01cb9c04 add climc 2018-09-05 19:48:52 +08:00
Zexi Li 94a5eedae4 webconsole: support baremetal ipmitool sol 2018-09-05 18:14:08 +08:00
邱剑 6d29c36abb Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'dc74b221da68ed6f2e86ca6b8dcb9bab9d3d361b':
  fix log
  修正：1. 已经绑定的EIP禁止删除 2. 删除server时候清除public IP记录
  浮动IP支持
  temp commit
 2018-09-05 17:02:45 +08:00
邱剑 dc74b221da Merge pull request #161 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-elastic-ip to release/2.1.0 
* commit '82bbb2054b9d72b542ea5d4d3aea931fe1103f26':
  fix log
  修正：1. 已经绑定的EIP禁止删除 2. 删除server时候清除public IP记录
  浮动IP支持
  temp commit
 2018-09-05 17:02:45 +08:00
李泽玺 08f8ae51c3 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '3485184266e553d278c9c68ddaae3850dbc4cc8a':
  webconsole: use external frontend
  - remove unused code - add rpm build files
  vendor added
  webterm init
 2018-09-05 16:10:36 +08:00
Qiu Jian 45f7f6febe Merge branch 'release/2.1.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-elastic-ip 2018-09-04 23:46:43 +08:00
Qiu Jian f4f2d8fb97 浮动IP支持 2018-09-04 23:04:29 +08:00
Zexi Li a6736da35e webterm init 2018-09-04 18:44:52 +08:00
邱剑 0f30bcbbb0 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '031ed3a3e8c9704e2545eb61ca3a5c45350b2875':
  支持server-save-image
 2018-09-04 16:35:26 +08:00
邱剑 031ed3a3e8 Merge pull request #151 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/kvm-save-image to release/2.1.0 
* commit '67fc4d1ba9b8fbfb9e59292ee64d09319056e929':
  支持server-save-image
 2018-09-04 16:35:25 +08:00
邱剑 c5c5a3ead9 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '5646b88f78e9fdedbf116d6b2262571902debef6':
  climc: k8s resources cluster in query or data
 2018-09-04 16:34:49 +08:00
Zexi Li b0c62d5512 climc: k8s resources cluster in query or data 2018-09-04 16:25:38 +08:00
屈轩 67fc4d1ba9 支持server-save-image 2018-09-03 17:25:59 +08:00
邱剑 4c24df8d85 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '1a02439127328a272105bfb62c48b4dfa312ba8e':
  vendor: add github.com/hako/durafmt
  climc: k8s-deployment-create support network
  climc: k8s cluster import and addnodes
  climc: k8s resource table print
  climc: k8s-deployment-create support network
  climc: k8s cluster import and addnodes
  climc: k8s resource table print
 2018-08-29 16:43:49 +08:00
Zexi Li a61c37501a climc: k8s resource table print 2018-08-29 14:43:53 +08:00
TangBin a0da87cee5 allow return update time 2018-08-28 19:45:33 +08:00
TangBin bbe0c66dd6 add notice climc command 2018-08-28 11:49:57 +08:00
TangBin b419132cfe bugfix 2018-08-27 19:44:33 +08:00
TangBin 2703745e74 add notice mod 2018-08-27 19:36:16 +08:00