opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-05 15:31:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,767 Commits 30 Branches 714 Tags
98fcd1df0f1158e5184a0a33bfda170bae76f7e5
Commit Graph
6987 Commits
Author SHA1 Message Date
Qiu Jian b70de93aa8 Merge branch 'release/2.5.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.6.0-20190214 
Conflicts:
	Gopkg.lock
 2019-02-13 21:49:51 +08:00
邱剑 b9b57e8441 Merge pull request #1033 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-image-bugfix-20190213 to release/2.5.0 
* commit 'dd317fb83d6540ba565558acbffdadd1d5ea63ec':
  update vendor
  fix image misc bugs
 2019-02-13 21:44:51 +08:00
邱剑 55ec95f0ac Merge pull request #1032 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/delete-backup-server to release/2.6.0 
* commit '0022d65b001c71d5d59d62de581200e6ff2708d1':
  add delete backup guest, fix bugs
 2019-02-13 21:24:17 +08:00
邱剑 d0f2bfcad0 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit 'e38f007c512e27f00630a34629006067660b6db8':
  implement baremetal host driver
  minor updates
 2019-02-13 18:26:58 +08:00
Qiu Jian 4bca4b1e6e implement baremetal host driver 2019-02-13 18:23:57 +08:00
TangBin 5fbc28f8aa server get disks fix 2019-02-13 18:07:18 +08:00
TangBin 632d1118db server delete etc fix 2019-02-13 17:04:06 +08:00
Qiu Jian d45003f87d Merge branch 'release/2.5.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-host-convert-sched-failed 2019-02-13 16:10:14 +08:00
Zexi Li e8d8097627 修正: disk 传入 scheduler 参数不对, size_mb 应该为 size 2019-02-13 15:49:29 +08:00
李泽玺 3021e37e87 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '9d6a769c8b0afe2fc5b9126f749135cf70fcd7ae':
  baremetal: host convert failed
  fix: recode host convert codes to fix scheduler failure issues
 2019-02-13 15:48:21 +08:00
Qiu Jian 8b71e18f2b Merge branch 'hotfix/qj-host-convert-sched-failed' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-host-convert-sched-failed 2019-02-13 15:38:50 +08:00
Qiu Jian b11f117781 minor updates 2019-02-13 15:38:30 +08:00
Zexi Li 1fe2bbe0e0 baremetal: host convert failed 2019-02-13 15:10:10 +08:00
Qiu Jian 924ae176b8 fix: recode host convert codes to fix scheduler failure issues 2019-02-13 14:51:05 +08:00
TangBin 7a447d31db server delete etc fix 2019-02-13 12:14:16 +08:00
Qiu Jian 0ad4c22879 Merge branch 'release/2.5.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.6.0-20190213 
Conflicts:
	pkg/compute/tasks/cloud_provider_sync_info_task.go
 2019-02-13 12:12:19 +08:00
Qiu Jian 6fccbfcd6e Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.5.0-20190213 
Conflicts:
	pkg/compute/models/guests.go
	pkg/compute/service/service.go
	pkg/compute/tasks/cloud_provider_sync_info_task.go
 2019-02-13 12:01:01 +08:00
邱剑 a7e68511fc Merge pull request #1031 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-clean-provider-issues to release/2.6.0 
* commit '137c0d41df393559b07448fa3d32f24d27e3d169':
  fix: fix issues preventing clean_provider.sh from clean cloud provider records
 2019-02-13 11:46:12 +08:00
邱剑 f893d5b256 Merge pull request #1029 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-logger-misc-bugfix to release/2.6.0 
* commit '5c9be39f52c552e49963e95c1d2cf2eb321d934a':
  log doCreateItem exceptions
  add action-show admin mode parameter
  add action-show admin mode parameter
  fix misc logger bugs
 2019-02-13 11:45:38 +08:00
邱剑 db1e36c897 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '42b3caf285bcb2580cbed167b107f895768abba3':
  fix: baremetal driver did not implement StartGuestRestartTask
 2019-02-13 11:45:01 +08:00
Qiu Jian 9bd15451ae fix image misc bugs 2019-02-13 00:10:03 +08:00
tangbin 2d4166e841 backend group sync bugfix 2019-02-12 23:32:38 +08:00
wanyaoqi 0022d65b00 add delete backup guest, fix bugs 2019-02-12 20:56:08 +08:00
邱剑 c5785af74c Merge pull request #1028 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-mv-dhcp-pkg to release/2.6.0 
* commit '79d5e74ea90baa8b6ea1ee05cbe3579ff53d6435':
  mv: pkg/cloudcommon/dhcp -> pkg/util/dhcp
 2019-02-12 20:43:38 +08:00
邱剑 687849a1ee Merge pull request #1026 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-joint-manager-interface-broken to release/2.6.0 
* commit 'a425132177ed1e6d1058624552f44575421b1812':
  fix: mcclient/module JointManager interface changes make implementation broken
 2019-02-12 20:43:10 +08:00
Qiu Jian 137c0d41df fix: fix issues preventing clean_provider.sh from clean cloud provider 
records
 2019-02-12 20:40:11 +08:00
TangBin b4e4cbad28 make fmt 2019-02-12 20:11:12 +08:00
TangBin 8bf555851d add sync 2019-02-12 20:02:05 +08:00
Qiu Jian 5c9be39f52 log doCreateItem exceptions 2019-02-12 17:08:23 +08:00
Qiu Jian ddc42ce54e add action-show admin mode parameter 2019-02-12 16:29:26 +08:00
Zexi Li 79d5e74ea9 mv: pkg/cloudcommon/dhcp -> pkg/util/dhcp 2019-02-12 16:09:53 +08:00
Qiu Jian a57733bae8 fix: baremetal driver did not implement StartGuestRestartTask 2019-02-12 15:21:29 +08:00
Qiu Jian eaeb41a2d7 fix misc logger bugs 2019-02-12 14:50:58 +08:00
邱剑 0725f68921 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit 'b22ec29c0c3290fb969c28bd7f92226b0680536c':
  make both golang and python option for ssl ca file as ssl_ca_certs
 2019-02-12 09:33:44 +08:00
Qiu Jian a425132177 fix: mcclient/module JointManager interface changes make implementation 
broken
 2019-02-12 09:14:02 +08:00
Qiu Jian 173526ce06 fix: correct VM expiration date before clean expired prepaid VM 2019-02-12 01:02:57 +08:00
邱剑 808347aed1 Merge pull request #1018 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-notify-with-template to release/2.6.0 
* commit '44faf10bfd78537d97c921867e3316a216f59147':
  update influxdb in a more graceful manner
  removel logs
  minor fixes
  增加：补充完整通知消息功能
 2019-02-11 23:04:17 +08:00
Qiu Jian 44faf10bfd update influxdb in a more graceful manner 2019-02-11 23:01:44 +08:00
Qiu Jian fa7bce7853 make both golang and python option for ssl ca file as ssl_ca_certs 2019-02-11 21:05:36 +08:00
邱剑 cf1d09ad66 Merge pull request #1006 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/log-service-golang to release/2.6.0 
* commit 'bb5aa4d3155c5dd6aca6ed06644c6e95bef8b742':
  minor updates
  update systemd unit description
  add logger rpm build scripts
  minor fixes
  logger service, half baked, needs more work
 2019-02-11 20:59:08 +08:00
邱剑 8c894127bd Automatic merge from release/2.5.0 -> release/2.6.0 
* commit 'cd61e90012211416d538fbf1991d8434f01908b9':
  删除安全组后先隐藏后删除
 2019-02-11 20:43:39 +08:00
邱剑 6f933566da Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '379e0ac7bc6f64d0a9679cc4998d0abfd68af156':
  删除安全组后先隐藏后删除
 2019-02-11 20:43:38 +08:00
邱剑 cd61e90012 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '6f933566da6f033e430fa0a7f69fd169dbc3b8ce':
  删除安全组后先隐藏后删除
 2019-02-11 20:43:38 +08:00
邱剑 379e0ac7bc Merge pull request #1022 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-secgroup-delete to release/2.3.0 
* commit 'ccfc1168e00f54cd98a0f484ed3459a2d340d7cd':
  删除安全组后先隐藏后删除
 2019-02-11 20:43:37 +08:00
邱剑 9f09640238 Merge pull request #1021 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-baremetal-ipmi-password to release/2.6.0 
* commit '16ad823d9e82e2f983d6e9d75a10c5377688b7d3':
  修正: baremetal prepare 时修改密码不生效
 2019-02-11 20:22:07 +08:00
邱剑 f6e644648a Automatic merge from release/2.5.0 -> release/2.6.0 
* commit 'f41fe12e990be35e40dd4c5e3aa47183ec63042a':
  缓存lb endpoint
  请求aliyun负载均衡使用对应的endpoint
 2019-02-11 20:19:51 +08:00
屈轩 ccfc1168e0 删除安全组后先隐藏后删除 2019-02-11 20:10:27 +08:00
Zexi Li 16ad823d9e 修正: baremetal prepare 时修改密码不生效 2019-02-11 20:00:07 +08:00
TangBin f287c8e091 add sync 2019-02-11 18:57:02 +08:00
屈轩 205b20cc0f 修复auto_start参数失效问题 2019-02-11 18:22:53 +08:00