opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,623 Commits 27 Branches 687 Tags
29c8d86870850bb92c1973650f56d6d64e07c41d
Commit Graph
1711 Commits
Author SHA1 Message Date
TangBin 29c8d86870 skus sync with account 2018-12-05 15:27:38 +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 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
TangBin 82bf62f489 aws security group add tags conflicts fix 2018-12-04 16:26:42 +08:00
邱剑 818c2af8c7 Merge pull request #650 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-qcloud-instance-filter to release/2.3.0 
* commit '3a1abae2e6c4df4f0a81602424afbc1eb1eecf1e':
  避免id为空时返回其他机器
 2018-12-04 16:24:48 +08:00
屈轩 3a1abae2e6 避免id为空时返回其他机器 2018-12-04 13:47:29 +08:00
TangBin b34cb29444 aws security group add tags 2018-12-04 12:02:58 +08:00
TangBin 70f0f743ed aws security group fix 2018-12-04 11:52:04 +08:00
屈轩 3fdc72b164 解决冲突 2018-12-04 11:42:06 +08:00
邱剑 e0fe689607 Merge pull request #645 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-qcloudcli-eip-cli to release/2.3.0 
* commit '3518527ef3a1a70cdc53c34cb29d08cb2d93d30b':
  修复qcloudcli eip命令参数缺失
 2018-12-04 11:03:52 +08:00
邱剑 fa8d274c43 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '59d210f5a725897702c68627e8efeaeabe166b53':
  修复: qcloud卸载磁盘API
 2018-12-04 09:47:07 +08:00
屈轩 307c08f2a0 修复: qcloud卸载磁盘API 2018-12-03 22:26:49 +08:00
屈轩 3518527ef3 修复qcloudcli eip命令参数缺失 2018-12-03 22:01:18 +08:00
Yousong Zhou bae1eeaa58 pkg/{aws,azure,qcloud}: fix compilation 2018-12-03 13:47:38 +00:00
Yousong Zhou 3386c0f59e appsrv: workers: 移除调试用日志 2018-12-03 13:44:46 +00:00
Yousong Zhou 5a092d203c db_dispatcher: 移除对listFields的调试日志 2018-12-03 13:44:46 +00:00
Yousong Zhou 273f26848b cloudcommon: models: 注册modelMan时检查crud tag值 2018-12-03 13:44:46 +00:00
Yousong Zhou 801eabbe83 policy: 同步时日志调整 2018-12-03 13:44:45 +00:00
wanyaoqi ea81fa26db fix BaremetalSyncAllGuestsStatusTask 2018-12-03 20:19:20 +08:00
Zexi Li 1b3d33986b region: baremetal api compatible 2018-12-03 20:04:30 +08:00
邱剑 c33df15e64 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '8894a6a96ff84d50cdba274d2cee76b874100420':
  创建主机时关联秘钥
  eip同步信息修复
 2018-12-03 19:56:36 +08:00
Zexi Li 22050bca71 region: baremetal api compatible 2018-12-03 18:51:06 +08:00
屈轩 1ff18372b7 创建主机时关联秘钥 2018-12-03 18:31:29 +08:00
屈轩 2ad16ecd4f eip同步信息修复 2018-12-03 18:25:36 +08:00
邱剑 ee0df651ce Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '33ef5a50085f26c79b36210265183300f3aa996c':
  创建主机时未设置安全组信息
 2018-12-03 17:39:17 +08:00
邱剑 33ef5a5008 Merge pull request #642 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-qcloud-instance-secgroup to release/2.3.0 
* commit '9dfc8a39c96496a8326d5abb7777a90ee3010b3b':
  创建主机时未设置安全组信息
 2018-12-03 17:39:16 +08:00
邱剑 24b210b91e Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'ddfe759c8b8e3b765fb4dab832eb7818390e0658':
  避免一直创建snapshot
  避免第一次更改完配置失败后直接返回
 2018-12-03 17:39:02 +08:00
屈轩 9dfc8a39c9 创建主机时未设置安全组信息 2018-12-03 17:22:56 +08:00
屈轩 ffd973d98e 避免一直创建snapshot 2018-12-03 16:54:46 +08:00