opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-05 23:41:47 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,932 Commits 30 Branches 714 Tags
ccbebfdafd79e75edf5cb0409cdd35a0d2a2cbee
Commit Graph
3166 Commits
Author SHA1 Message Date
周有松 ccbebfdafd Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '6ad0de9608050bbdb8ad88fd7a4241a9be07307f':
  fix: to make it consistent, change cloudproviderregion auto_sync to enable_auto_sync
 2019-03-08 17:41:34 +08:00
周有松 6ad0de9608 Merge pull request #1190 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-sync-with-lock to release/2.7.0 
* commit '9d5ef350fca63e1bf8544531973be0494076b3d2':
  fix: to make it consistent, change cloudproviderregion auto_sync to enable_auto_sync
 2019-03-08 17:41:34 +08:00
Qiu Jian 9d5ef350fc fix: to make it consistent, change cloudproviderregion auto_sync to 
enable_auto_sync
 2019-03-07 22:35:30 +08:00
周有松 358440748b Automatic merge from release/2.7.0 -> release/2.8.0 
* commit 'efb82d177edf70e522b6208bfe1e56d15eb15104':
  补充缺少导入的包
 2019-03-07 19:24:49 +08:00
屈轩 640d4464be 补充缺少导入的包 2019-03-07 18:05:26 +08:00
万垚奇 e4fc18b59a Automatic merge from release/2.7.0 -> release/2.8.0 
* commit 'e0db43c8907f92585ca815f37130b59414970f6e':
  add hotplug check
 2019-03-07 17:50:29 +08:00
万垚奇 e0db43c890 Merge pull request #1172 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/cpu-mem-wyq/hotplug to release/2.7.0 
* commit '7c39255ef75158324e597b096a596f02c36fad48':
  add hotplug check
 2019-03-07 17:50:29 +08:00
周有松 244fa55a7a Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '68fd0c3b064e98e34dedb945c56c7170cb3e404a':
  更新成功后才添加日志记录
 2019-03-07 17:24:38 +08:00
屈轩 8a117aac75 更新成功后才添加日志记录 2019-03-07 17:22:01 +08:00
周有松 9067393496 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit 'a97e2faea83578ae8495ab2e4a3bb22bbfcfde4c':
  修正一些错误信息描述
 2019-03-07 16:57:59 +08:00
周有松 a97e2faea8 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '84d91f281103767b964a6b09aeba85c854a59c5e':
  修正一些错误信息描述
 2019-03-07 16:57:59 +08:00
周有松 84d91f2811 Merge pull request #1185 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-error-return to release/2.6.0 
* commit '58ee33c3f09792838d79420703fc560db07c6258':
  修正一些错误信息描述
 2019-03-07 16:57:58 +08:00
屈轩 58ee33c3f0 修正一些错误信息描述 2019-03-07 16:48:15 +08:00
周有松 328d5396ee Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '8e5f047a9b448fa3842bbe6f792e915de1306977':
  私有云套餐被错误过滤掉fix
 2019-03-07 16:22:25 +08:00
周有松 8e5f047a9b Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '9aa91fc88acdc44ed220205af87d7699071b5e86':
  私有云套餐被错误过滤掉fix
 2019-03-07 16:22:25 +08:00
周有松 9aa91fc88a Merge pull request #1182 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-huawei-import-image-bugfix to release/2.6.0 
* commit 'd38f38dfb7fe3710df693aac93bea93ddbc2e657':
  私有云套餐被错误过滤掉fix
 2019-03-07 16:22:24 +08:00
邱剑 c09e93ed0b Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '959bc3ec20a89f5da29ceafba08bafed7ccbb251':
  conditional compilation: compile rbd on linux only
  update vendor
  improvements: autonomously adjust sync interval according to resources in region
  skip objects that is undergoing a task
  fix: resolve import loop between skus and models, merge skus into models
  feature: allow auto sychrnoization of cloud account
 2019-03-07 16:08:00 +08:00
邱剑 959bc3ec20 Merge pull request #1148 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-sync-with-lock to release/2.7.0 
* commit '52ab56fa3f338caaed7a7a9ff3bc45a8f2f661eb':
  conditional compilation: compile rbd on linux only
  update vendor
  improvements: autonomously adjust sync interval according to resources in region
  skip objects that is undergoing a task
  fix: resolve import loop between skus and models, merge skus into models
  feature: allow auto sychrnoization of cloud account
 2019-03-07 16:08:00 +08:00
TangBin d38f38dfb7 私有云套餐被错误过滤掉fix 2019-03-07 15:46:23 +08:00
Qiu Jian 52ab56fa3f Merge branch 'release/2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-sync-with-lock 
Conflicts:
	pkg/compute/guestdrivers/aws.go
 2019-03-07 15:22:58 +08:00
万垚奇 9419405ba1 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '3fa13e38018d796cb723dba148e9ca39adcee30d':
  修复: host kube agent 相关 task 没有正确通知 k8s service
 2019-03-07 15:22:35 +08:00
万垚奇 3fa13e3801 Merge pull request #1180 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-host-kube-handler to release/2.7.0 
* commit '3c430a637b1913c3aa4fcc30a803b6912b124430':
  修复: host kube agent 相关 task 没有正确通知 k8s service
 2019-03-07 15:22:35 +08:00
Zexi Li 3c430a637b 修复: host kube agent 相关 task 没有正确通知 k8s service 2019-03-07 15:20:04 +08:00
周有松 122d49d3a8 Merge pull request #1181 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-huawei-import-image-bugfix to release/2.6.0 
* commit '5bcf5942933e759ba888fdee3046e8ebf3bb0368':
  build error fix
 2019-03-07 15:18:03 +08:00
周有松 3b4796bd3b Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '6bd1afa91762870777d2d4538897db9f5f5f3525':
  build error fix
 2019-03-07 15:18:03 +08:00
周有松 6bd1afa917 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '122d49d3a822239c019f30fda0873c0bd4f123cb':
  build error fix
 2019-03-07 15:18:03 +08:00
TangBin 5bcf594293 build error fix 2019-03-07 15:16:37 +08:00
周有松 921038826d Merge pull request #1178 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-openstack-rebuild-root to release/2.6.0 
* commit '9185c3c2acf055da048f525b10bd754c1affec3d':
  避免deploy任务结束时检查系统盘id与返回的磁盘id不匹配导致任务失败
 2019-03-07 14:47:14 +08:00
周有松 09fe040285 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '921038826d35fc655bc1dac048d9630c29468af3':
  避免deploy任务结束时检查系统盘id与返回的磁盘id不匹配导致任务失败
 2019-03-07 14:47:14 +08:00
周有松 6cf678e809 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '09fe040285299bc0155d2e4c049c8400b067c086':
  避免deploy任务结束时检查系统盘id与返回的磁盘id不匹配导致任务失败
 2019-03-07 14:47:14 +08:00
屈轩 9185c3c2ac 避免deploy任务结束时检查系统盘id与返回的磁盘id不匹配导致任务失败 2019-03-07 14:44:59 +08:00
周有松 7a1acc9f01 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '5f42063e04d8b23fbae8e995cc691a079d8b8f1c':
  minor fixes
  fix: 1. host start works for baremetal server with guest 2. fix host-syncstatus  3. baremetal may answer pxe request for hypervisors
 2019-03-07 14:42:10 +08:00
周有松 0c089ccafc Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '7a1acc9f0102f8cee20703fa3e36e3efc1ac94bb':
  minor fixes
  fix: 1. host start works for baremetal server with guest 2. fix host-syncstatus  3. baremetal may answer pxe request for hypervisors
 2019-03-07 14:42:10 +08:00
周有松 5f42063e04 Merge pull request #1176 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-host-start-misc-20190327 to release/2.6.0 
* commit '6aaa82b7c3c44cfb98870c488670feee2e175839':
  minor fixes
  fix: 1. host start works for baremetal server with guest 2. fix host-syncstatus  3. baremetal may answer pxe request for hypervisors
 2019-03-07 14:42:09 +08:00
周有松 327145d173 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '2ae7c3e5c35a2181020baaa308f06cbc703090db':
  disk GB fix && make fmt
 2019-03-07 14:41:48 +08:00
周有松 a5397cf7f7 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '327145d173fc1e82cf809872328db3d1687799eb':
  disk GB fix && make fmt
 2019-03-07 14:41:48 +08:00
周有松 91b45841be Automatic merge from release/2.7.0 -> release/2.8.0 
* commit 'f84b75977e4d7c3f5830700922c498d84c4d8ca0':
  过滤掉不支持的huawei skus & image
  imagetools add RHEL dist
  统一aws登录用户名
  统一aliyun登录用户名
  使用公有云镜像时，正确设置登录用户名
 2019-03-07 14:41:34 +08:00
周有松 f84b75977e Merge pull request #1177 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-conflicts-fix-2.7.0 to release/2.7.0 
* commit '8009f714d4a39c5fbbabc5a059b103479856b851':
  过滤掉不支持的huawei skus & image
  imagetools add RHEL dist
  统一aws登录用户名
  统一aliyun登录用户名
  使用公有云镜像时，正确设置登录用户名
 2019-03-07 14:41:33 +08:00
TangBin e6f4186236 disk GB fix && make fmt 2019-03-07 14:28:21 +08:00
TangBin 8009f714d4 Merge branch 'release/2.6.0' of ssh://git.yunion.io/~tangbin/onecloud into release/2.7.0 2019-03-07 11:08:37 +08:00
周有松 d1511914a9 Merge pull request #1157 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-qcloud-username to release/2.6.0 
* commit 'e74d3f61cbe960c087a43c6fe2184b700609838d':
  imagetools add RHEL dist
  统一aws登录用户名
  统一aliyun登录用户名
  使用公有云镜像时，正确设置登录用户名
 2019-03-07 10:55:33 +08:00
Qiu Jian 6aaa82b7c3 minor fixes 2019-03-07 01:56:23 +08:00
Qiu Jian b8bd9b1fbe fix: 1. host start works for baremetal server with guest 2. fix 
host-syncstatus  3. baremetal may answer pxe request for hypervisors
 2019-03-07 01:52:44 +08:00
邱剑 9339bee71c Merge pull request #1173 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-huawei-image-list-fix to release/2.6.0 
* commit '0bb016d4431c937da79a788f6977ffd47d718aa7':
  过滤掉不支持的huawei skus & image
 2019-03-06 23:55:01 +08:00
邱剑 ee523fd312 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '09837a31a04d9937e72a8bf29c3ef9431655f79a':
  创建openstack磁盘使用默认的zone
 2019-03-06 23:47:30 +08:00
邱剑 09837a31a0 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'd8ffe73d588b61f1011d3b3356127d0464c272b2':
  创建openstack磁盘使用默认的zone
 2019-03-06 23:47:30 +08:00
邱剑 d8ffe73d58 Merge pull request #1174 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-openstack-disk-create to release/2.6.0 
* commit '2a039a782d9a6cd2ce3d346d5502755edbd363b7':
  创建openstack磁盘使用默认的zone
 2019-03-06 23:47:29 +08:00
邱剑 b7c689cacd Merge pull request #1170 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-keystone-credential-totp-api to release/2.8.0 
* commit '929085d68b0eecf6e6e6b477a4f9b2637ae99afe':
  feature: add API to access TOTP/recovery secrets via keystone credential API
 2019-03-06 23:22:26 +08:00
邱剑 dc2e48f9d3 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '089040d61a959c8cd3ba6b0cfea2cd3c35399338':
  fix: umount rootfs before zerofree the partition
 2019-03-06 23:21:52 +08:00
邱剑 089040d61a Merge pull request #1171 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-unount-rootfs-before-zerofree to release/2.6.0 
* commit 'aee2a608836b23b329e58947eb80d69117c47f7f':
  fix: umount rootfs before zerofree the partition
 2019-03-06 23:21:51 +08:00