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,001 Commits 27 Branches 687 Tags
05ae3df45810effefcabbf70be35c213f4c52c11
Commit Graph
2001 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
屈轩 05ae3df458 Merge branch 'hotfix/qx-azure-name-change' of ssh://git.yunion.io/~quxuan/onecloud into release/2.4.0 2018-11-14 21:25:12 +08:00
屈轩 0764bed086 避免更新Azure guest名称 2018-11-14 21:24:50 +08:00
屈轩 9bedca78c0 Merge branch 'release/2.4.0' of ssh://git.yunion.io/~quxuan/onecloud into release/2.4.0 2018-11-14 21:23:37 +08:00
邱剑 e80b5987ff Merge pull request #485 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:feature/yousong-climc-version-list to release/2.4.0 
* commit 'e11a46058594e8c3a1abba6c7f2410792844417b':
  climc: add commands yunionagent-version-list, yunionagent-version-show
 2018-11-14 20:48:51 +08:00
邱剑 0209fec9d3 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '65a5c787c92f35f5082bd1e9142304d1701b2af3':
  climc: set and update k8s cluster engineconfig
 2018-11-14 20:04:06 +08:00
邱剑 65a5c787c9 Merge pull request #497 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-set-k8s-engineconfig to release/2.3.0 
* commit '32b62333e24de389ae7e62963e43150e3576e078':
  climc: set and update k8s cluster engineconfig
 2018-11-14 20:04:05 +08:00
Zexi Li 32b62333e2 climc: set and update k8s cluster engineconfig 2018-11-14 18:24:57 +08:00
邱剑 dedbb3848e Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'f72ee1063fc29b2c840648c143c7c3dfb6d578cb':
  避免Azure绑定秘钥时stop机器
  更新Azure密钥后直接返回
 2018-11-14 16:15:56 +08:00
邱剑 f72ee1063f Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'f18eb7ddec21a3016fbd698cf5a7fa4c6e3603d2':
  避免Azure绑定秘钥时stop机器
  更新Azure密钥后直接返回
 2018-11-14 16:15:55 +08:00
邱剑 f18eb7ddec Merge pull request #496 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-azure-keypair to release/2.2.0 
* commit 'ea620ef7ca68853f14c92d5fb275cf215ed8bc23':
  避免Azure绑定秘钥时stop机器
  更新Azure密钥后直接返回
 2018-11-14 16:15:55 +08:00
屈轩 237c128456 Merge branch 'bugfix/qx-azure-keypair' of ssh://git.yunion.io/~quxuan/onecloud into release/2.4.0 2018-11-14 15:42:39 +08:00
屈轩 ea620ef7ca 避免Azure绑定秘钥时stop机器 2018-11-14 15:40:52 +08:00
屈轩 5c09c64644 更新Azure密钥后直接返回 2018-11-14 15:28:13 +08:00
邱剑 0dfcf1b844 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '4170cdaadc4066ff0bce015e0166b3b53e30eafc':
  修正：climc调用rbac接口参数错误
 2018-11-13 22:35:20 +08:00
邱剑 4170cdaadc Merge pull request #495 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-fix-rbac-enable-incompatible to release/2.3.0 
* commit '43f9b6d61c7d9a24284e0b2baa42f6fae4b30c3d':
  修正：climc调用rbac接口参数错误
 2018-11-13 22:35:19 +08:00
Qiu Jian 43f9b6d61c 修正：climc调用rbac接口参数错误 2018-11-13 22:33:38 +08:00
邱剑 88ebe6fed8 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'b2ffa81af90bb330b42d212edb11f55da40334be':
  优化azure secgroup规则同步
 2018-11-13 22:03:33 +08:00
邱剑 82fe6e2d45 Merge pull request #494 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-azure-secgroup-optimization to release/2.2.0 
* commit '9737f65716f6780755b8e5bfc995938a5199094f':
  优化azure secgroup规则同步
 2018-11-13 22:03:32 +08:00
邱剑 b2ffa81af9 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '82fe6e2d45431cad88ead06298a107c9886d19dd':
  优化azure secgroup规则同步
 2018-11-13 22:03:32 +08:00
邱剑 04810d11c5 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '6ca618d539f2f61fdc8c19236aaba4dca0769683':
  优化cloudprovider删除enable、disable逻辑
 2018-11-13 22:02:25 +08:00
邱剑 6ca618d539 Merge pull request #487 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-cloudaccount-optimization to release/2.3.0 
* commit '1ff0252f3f8ad3ae0db03d8f0d02c084270b5848':
  优化cloudprovider删除enable、disable逻辑
 2018-11-13 22:02:24 +08:00
邱剑 efb17ea441 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'c169fdb8dce18d1106d2db6f71b324e6bfc01fdf':
  添加更新操作后的操作
 2018-11-13 22:02:07 +08:00
邱剑 023fb8fa4a Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '50eebdd10d2a56bf6deb082877d944776065557b':
  添加更新操作后的操作
 2018-11-13 22:02:07 +08:00
邱剑 50eebdd10d Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'efb17ea441b34b078d36cbf32023ab8def0a6c92':
  添加更新操作后的操作
 2018-11-13 22:02:07 +08:00
邱剑 c169fdb8dc Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '7d3b8ea610703af122b861a16bee85d9d31a5aea':
  添加更新操作后的操作
 2018-11-13 22:02:07 +08:00
邱剑 7d3b8ea610 Merge pull request #493 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-post-update to release/2.0.0 
* commit 'ab846cfad77d8f01eab1f118dba1d1012c0ba4a1':
  添加更新操作后的操作
 2018-11-13 22:02:06 +08:00
邱剑 c0c6ae3d45 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'f69fbeaee75b4dc4673d1b05c5950d75a724b7b7':
  修正：1. rbac禁止所有的创建 2. 增加rbac_debug日志选项
 2018-11-13 22:01:18 +08:00
邱剑 f69fbeaee7 Merge pull request #488 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-rbac-deny-any-create to release/2.3.0 
* commit '1a53bba41f5172f65a051d6050a4aa0f7225c8b0':
  修正：1. rbac禁止所有的创建 2. 增加rbac_debug日志选项
 2018-11-13 22:01:18 +08:00
邱剑 8a146a92f9 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '11d305933001cdd41adde0cf3bb7d5c0319ade85':
  补充主机计费的shortdesc参数
 2018-11-13 22:01:03 +08:00
邱剑 21097e9f96 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '70e64329e93957a4772b468cfd7ad68c4ddf64e2':
  补充主机计费的shortdesc参数
 2018-11-13 22:01:03 +08:00
邱剑 70e64329e9 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '8a146a92f981d3fb318ab33fc2a0efde1ae77740':
  补充主机计费的shortdesc参数
 2018-11-13 22:01:03 +08:00
邱剑 11d3059330 Merge pull request #490 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-fix-server-short-desc to release/2.1.0 
* commit '36dda2a5b4ac268280c3e660d29666dcc6a68060':
  补充主机计费的shortdesc参数
 2018-11-13 22:01:02 +08:00
邱剑 c61a4c36c5 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '630b5df49e96d23d6b87a08fbd9572971be73587':
  修正：删除主机时忽略停机错误
  scheduler: filter host when cloudprovider status not connected
 2018-11-13 21:58:46 +08:00
邱剑 630b5df49e Merge pull request #492 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-resolve-conflict-20181113-2.3.0 to release/2.3.0 
* commit 'db9fd8aeb336408296df024f9b40a395344def65':
  修正：删除主机时忽略停机错误
  scheduler: filter host when cloudprovider status not connected
 2018-11-13 21:58:46 +08:00
屈轩 9737f65716 优化azure secgroup规则同步 2018-11-13 20:58:27 +08:00
屈轩 ab846cfad7 添加更新操作后的操作 2018-11-13 20:18:27 +08:00
Qiu Jian db9fd8aeb3 Merge branch 'release/2.2.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20181113-2.3.0 
Conflicts:
	pkg/scheduler/db/models/default.go
 2018-11-13 19:10:40 +08:00
邱剑 13703b6072 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '62f27f05f570292866f6a140a4dc4b84b2eee889':
  修正：删除主机时忽略停机错误
 2018-11-13 19:08:28 +08:00
邱剑 e3443851ad Merge pull request #486 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-delete-server-ignore-stop-error to release/2.0.0 
* commit 'cda1edfc45cfaedc935be32b939928b341ecb3f3':
  修正：删除主机时忽略停机错误
 2018-11-13 19:08:27 +08:00
邱剑 62f27f05f5 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'e3443851adc4510e2944d3e77cb323289dcf3aa8':
  修正：删除主机时忽略停机错误
 2018-11-13 19:08:27 +08:00
Qiu Jian 36dda2a5b4 补充主机计费的shortdesc参数 2018-11-13 18:21:55 +08:00
Qiu Jian 1a53bba41f 修正：1. rbac禁止所有的创建 2. 增加rbac_debug日志选项 2018-11-13 16:57:36 +08:00
屈轩 1ff0252f3f 优化cloudprovider删除enable、disable逻辑 2018-11-13 16:56:40 +08:00
Qiu Jian cda1edfc45 修正：删除主机时忽略停机错误 2018-11-13 16:16:20 +08:00
Yousong Zhou e11a460585 climc: add commands yunionagent-version-list, yunionagent-version-show 2018-11-13 07:43:11 +00:00
李泽玺 3c38df17b7 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '0acf8b959e1962774d6448184834c00f4f108dd7':
  resolve merge conflict
 2018-11-13 14:07:07 +08:00
李泽玺 0acf8b959e Merge pull request #484 in YUNIONIO/onecloud from ~LIZEXI/onecloud:hotfix/lzx-resolve-conflict-2.3.0-20181113 to release/2.3.0 
* commit '0ef732ea81d5cbfa5e1fd621111f101140c2fcc0':
  resolve merge conflict
 2018-11-13 14:07:06 +08:00
Zexi Li 0ef732ea81 resolve merge conflict 2018-11-13 14:05:39 +08:00
李泽玺 85dd494de2 Merge pull request #480 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-sched-host-provider-status to release/2.2.0 
* commit '45e9ecd36264c45704812e35506b3d9626b3c455':
  scheduler: filter host when cloudprovider status not connected
 2018-11-13 14:02:38 +08:00
邱剑 a5e05d40db Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '6ee06d38b0b2ea857bc2a67573c571647f9d1b7a':
  在线更改配置，不需要等待虚机状态为ready
 2018-11-13 12:23:07 +08:00