opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 06:09:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,668 Commits 27 Branches 687 Tags
dfb2e0e00c14f8f588c9a4819da8c3c5ff14e5a3
Commit Graph
1740 Commits
Author SHA1 Message Date
Qiu Jian dfb2e0e00c Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-vm-resource-pooling 2018-12-05 18:09:11 +08:00
Qiu Jian 8ab0275a36 temp commit 2018-12-05 18:06:57 +08:00
唐斌 749c2f1de4 Merge pull request #679 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-skus-sync to release/2.4.0 
* commit 'ea3df1d1901df9f4869669e894c1894657fb2a33':
  make fmt
  sync skus bugfix
  sku sync add limit & offset
  skus sync with account
 2018-12-05 17:58:50 +08:00
邱剑 06a93f8a79 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '39902718f2f258b34727b15399e42522b0da1dac':
  腾讯云不允许扩容系统盘
 2018-12-05 17:52:49 +08:00
屈轩 099c4fe020 腾讯云不允许扩容系统盘 2018-12-05 17:18:12 +08:00
TangBin ea3df1d190 make fmt 2018-12-05 16:57:05 +08:00
TangBin 568f54c35e sync skus bugfix 2018-12-05 16:29:26 +08:00
TangBin a0ea5fb76b sku sync add limit & offset 2018-12-05 16:09:25 +08:00
邱剑 48b3a0062e Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '434c839a49559d7120b64a7593cdf40dd81d7122':
  添加腾讯云错误重试代码
 2018-12-05 15:36:16 +08:00
邱剑 434c839a49 Merge pull request #677 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-qlcoud-error to release/2.3.0 
* commit '6a7c12b02b2c18bb53fd4b3dc5098b4409ab171e':
  添加腾讯云错误重试代码
 2018-12-05 15:36:15 +08:00
屈轩 6a7c12b02b 添加腾讯云错误重试代码 2018-12-05 15:33:18 +08:00
TangBin 29c8d86870 skus sync with account 2018-12-05 15:27:38 +08:00
屈轩 42d8faf768 冲突解决 2018-12-05 14:58:10 +08:00
邱剑 15dd4edcb0 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'fc7f00e8a95c1f09ff82b2be06944f4040c9d160':
  冲突解决
 2018-12-05 14:43:45 +08:00
屈轩 05ebba4ab6 冲突解决 2018-12-05 14:42:16 +08:00
邱剑 fb038aab1e Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'ad9c026519b7866bce825f0cae888b1ef9c1ad1b':
  避免删除机器时，云端eip已经删除时，无限删除失败
 2018-12-05 14:37:40 +08:00
邱剑 ad9c026519 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '4b41872376803c3696a643e917729f06834ecce1':
  避免删除机器时，云端eip已经删除时，无限删除失败
 2018-12-05 14:37:40 +08:00
邱剑 4b41872376 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'ee9c48d3eff0adf0961b1ddea03bad19a37542e4':
  避免删除机器时，云端eip已经删除时，无限删除失败
 2018-12-05 14:37:40 +08:00
邱剑 ee9c48d3ef Merge pull request #670 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-eip-dissociate to release/2.1.0 
* commit '4a1ad108e466f94d91dbae210104d4c107ec3b5d':
  避免删除机器时，云端eip已经删除时，无限删除失败
 2018-12-05 14:37:39 +08:00
邱剑 54c05397bb Merge pull request #584 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-guest-secgroups to release/2.4.0 
* commit 'e34e45d00849a2ba9e05f00687c24b5841077e79':
  限制虚机绑定安全组数量
  初始化model
 2018-12-05 14:26:52 +08:00
屈轩 4a1ad108e4 避免删除机器时，云端eip已经删除时，无限删除失败 2018-12-05 13:31:16 +08:00
屈轩 e34e45d008 限制虚机绑定安全组数量 2018-12-05 12:40:47 +08:00
邱剑 ef5fe200cd Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'e11aa75a45e2ccb1ef8299db5de7c15337ca9654':
  normalize镜像版本
 2018-12-05 12:24:54 +08:00
屈轩 653ab7b414 normalize镜像版本 2018-12-05 12:06:49 +08:00
邱剑 8bb6c05241 Merge pull request #665 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-cronjob-run-on-startup-option to release/2.4.0 
* commit '7c84cd51e3da1cf4f8c192b675efc6caad484928':
  改进：cronJob增加 startRun 的开关，如果true，则程序一启动就运行一次job。
 2018-12-05 10:54:58 +08:00
Qiu Jian 669081f7f3 Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-vm-resource-pooling 2018-12-05 01:14:45 +08:00
Qiu Jian aa771897c9 1. 禁止删除prepaid主机 2. 定期清理过期的prepaid主机 2018-12-05 01:10:23 +08:00
Qiu Jian 3e87c17e72 support prepaid server create and renew 2018-12-05 00:40:15 +08:00
Qiu Jian f5c98090b2 Merge branch 'release/2.3.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-conflict-resolve-2.4.0-20181204 
Conflicts:
	pkg/compute/tasks/guest_delete_task.go
 2018-12-04 23:37:58 +08:00
Qiu Jian 7c84cd51e3 改进：cronJob增加 startRun 的开关，如果true，则程序一启动就运行一次job。 2018-12-04 23:33:03 +08:00
邱剑 16ecfc340f Merge pull request #663 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-guest-delete-none-host to release/2.3.0 
* commit 'a4048fcf0f859e6e40267026fdf61aea4c30e912':
  fix: region delete guest panic when host is nil
 2018-12-04 22:45:18 +08:00
Zexi Li a4048fcf0f fix: region delete guest panic when host is nil 2018-12-04 22:27:46 +08:00
邱剑 216e804f5b Merge pull request #659 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-guest-reset-passwd to release/2.3.0 
* commit 'db0d989fc83c9c28957ee6b965e8d5f70a0fe0a2':
  重置密码时重启机器
 2018-12-04 21:37:13 +08:00
邱剑 f2745e58c6 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '216e804f5bd28f4863892e7494c3a82dadb89e96':
  重置密码时重启机器
 2018-12-04 21:37:13 +08:00
邱剑 e9fd892b05 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '1f4c7d1f35b005fe7319357bfca083eefdc9df2a':
  id为空统一处理
 2018-12-04 21:33:13 +08:00
李泽玺 87b3ff746d Merge pull request #661 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-baremetal-api to release/2.4.0 
* commit 'd82fb4a773f7c3a7d1ad8e049fc114ea9f7f57c6':
  - region: fix host enable not clean sched cache - network dhcp and gateway searchable
 2018-12-04 21:23:13 +08:00
屈轩 4cce589b35 id为空统一处理 2018-12-04 21:16:52 +08:00
Zexi Li d82fb4a773 - region: fix host enable not clean sched cache 
- network dhcp and gateway searchable
 2018-12-04 20:59:22 +08:00
屈轩 db0d989fc8 重置密码时重启机器 2018-12-04 20:48:16 +08:00
邱剑 293a43ee27 Merge pull request #653 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-baremetal-api to release/2.4.0 
* commit '5dceb2685ca3a3c078f303ad8328c90ca43d6c8b':
  region: fix host enable not clean sched cache
  fix BaremetalSyncAllGuestsStatusTask
  region: baremetal api compatible
  region: baremetal api compatible
 2018-12-04 20:44:43 +08:00
邱剑 a4ed096cf5 Merge pull request #658 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-azure-deploy to release/2.4.0 
* commit '6b3d3a0fccb01adfbc06914d051474751daf4807':
  修复缺失的azure重置密码处理
 2018-12-04 20:43:57 +08:00
屈轩 6b3d3a0fcc 修复缺失的azure重置密码处理 2018-12-04 20:38:19 +08:00
屈轩 b0bbfb0f1a 解决冲突 2018-12-04 20:27:12 +08:00
邱剑 e9d5909229 Merge pull request #655 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-qcloud-eip to release/2.3.0 
* commit '07eab509aafddd72a34fa60269b0d1ccb1ded51f':
  避免eip为空返回其他的eip
 2018-12-04 20:17:46 +08:00
邱剑 db822c69db Merge pull request #654 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-qcloud-image to release/2.3.0 
* commit '3fa55efe42b44b3d8a4e9406aca41c970f2836f1':
  腾讯云导入镜像适配
 2018-12-04 20:17:36 +08:00
屈轩 07eab509aa 避免eip为空返回其他的eip 2018-12-04 19:49:49 +08:00
Zexi Li 5dceb2685c region: fix host enable not clean sched cache 2018-12-04 18:52:17 +08:00
屈轩 3fa55efe42 腾讯云导入镜像适配 2018-12-04 18:50:58 +08:00
李泽玺 3f3f1701c2 Merge pull request #1 in ~LIZEXI/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/fix-BaremetalSyncAllGuestsStatusTask to bugfix/lzx-baremetal-api 
* commit 'ea81fa26dbcb56eefe131387b2fab8c3b731029d':
  fix BaremetalSyncAllGuestsStatusTask
  region: baremetal api compatible
 2018-12-04 18:09:07 +08:00
邱剑 353a4f1f2a Merge pull request #651 in YUNIONIO/onecloud from release/2.3.0 to release/2.4.0 
* commit '818c2af8c7ff09b193f8bec30b527df312102cc3':
  避免id为空时返回其他机器
  aws security group add tags
  aws security group fix
 2018-12-04 17:52:56 +08:00