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
1,792 Commits 27 Branches 687 Tags
6ca618d539f2f61fdc8c19236aaba4dca0769683
Commit Graph
1792 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
邱剑 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
邱剑 50eebdd10d Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'efb17ea441b34b078d36cbf32023ab8def0a6c92':
  添加更新操作后的操作
 2018-11-13 22:02:07 +08:00
邱剑 efb17ea441 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'c169fdb8dce18d1106d2db6f71b324e6bfc01fdf':
  添加更新操作后的操作
 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
邱剑 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
邱剑 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
邱剑 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
屈轩 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
李泽玺 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
邱剑 6ee06d38b0 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'a6beb827f20310adcf62e2faff53bb2e7bee846f':
  在线更改配置，不需要等待虚机状态为ready
 2018-11-13 12:23:06 +08:00
邱剑 a6beb827f2 Merge pull request #481 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-resolve-conflict-20181113-2.2.0 to release/2.2.0 
* commit 'fbf31b2f13d28ae10a0f49e69e7c3e23cbce1768':
  在线更改配置，不需要等待虚机状态为ready
 2018-11-13 12:23:06 +08:00
Qiu Jian fbf31b2f13 Merge branch 'release/2.1.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20181113-2.2.0 
Conflicts:
	pkg/compute/guestdrivers/aliyun.go
 2018-11-13 12:06:33 +08:00
邱剑 ce24455d1b Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '5fb53912d86d4159ccc963899dd3b6eee54127d7':
  Azure挂载卸载磁盘更改lun有可能会失败
 2018-11-13 12:00:40 +08:00
邱剑 5fb53912d8 Merge pull request #478 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-azure-attach-detach-disk to release/2.2.0 
* commit '472dbfdfefa1a448800fc764df54af0d08c65772':
  Azure挂载卸载磁盘更改lun有可能会失败
 2018-11-13 12:00:39 +08:00
屈轩 472dbfdfef Azure挂载卸载磁盘更改lun有可能会失败 2018-11-13 11:52:37 +08:00
Zexi Li 45e9ecd362 scheduler: filter host when cloudprovider status not connected 2018-11-13 11:41:04 +08:00
邱剑 dbbcb7a4be Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '81b6682559969900b349d2c90c3498699a54f106':
  在线更改配置，不需要等待虚机状态为ready
 2018-11-13 11:39:02 +08:00
邱剑 81b6682559 Merge pull request #477 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-changeconfig to release/2.2.0 
* commit '8a8ff13e919587e2c702ef4725f9502369598af9':
  在线更改配置，不需要等待虚机状态为ready
 2018-11-13 11:39:02 +08:00
邱剑 c3371298f5 Merge pull request #476 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-aliyun-changeconfig to release/2.1.0 
* commit '008d6f10f51fceba973bb3c56edeca757dca8436':
  在线更改配置，不需要等待虚机状态为ready
 2018-11-13 11:38:47 +08:00
邱剑 84d7e390d4 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'e267bc77f2f130b62bc088b9167633c6c5761e8e':
  修正：host undo convert失败
 2018-11-13 11:38:02 +08:00
邱剑 e267bc77f2 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '6cefc7dc0205c1aba777ebb63576fb099408938d':
  修正：host undo convert失败
 2018-11-13 11:38:02 +08:00
邱剑 1c9b0ce6d6 Merge pull request #475 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-fix-host-undo-convert-fail to release/2.0.0 
* commit '00f5d3ba54c0e38f3c47e3ead9e9e3ba8d5ad341':
  修正：host undo convert失败
 2018-11-13 11:38:01 +08:00
邱剑 6cefc7dc02 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '1c9b0ce6d6ecce2f1faeb9fe643034d463761fe2':
  修正：host undo convert失败
 2018-11-13 11:38:01 +08:00
唐斌 b1acc90be3 Merge pull request #468 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-fix-make-regiondns-error to release/2.3.0 
* commit '6599ddc53b9a0ddb46c85ce08238c6e90c3e4b03':
  rm transitive dependents
  fix depends
  fix region-dns build error
 2018-11-13 10:51:11 +08:00
屈轩 8a8ff13e91 在线更改配置，不需要等待虚机状态为ready 2018-11-13 10:29:48 +08:00
屈轩 008d6f10f5 在线更改配置，不需要等待虚机状态为ready 2018-11-13 10:26:33 +08:00
Qiu Jian 00f5d3ba54 修正：host undo convert失败 2018-11-13 00:25:26 +08:00
邱剑 bc66c01ef3 Merge pull request #474 in YUNIONIO/onecloud from ~QUXUAN/onecloud:release/2.3.0 to release/2.3.0 
* commit 'fbf5f6825f31cfcc0e8222e68e91287aae38ad74':
  根据腾讯云主机状态判断磁盘是否可以resize
 2018-11-12 22:03:46 +08:00
邱剑 c2bc969070 Merge pull request #473 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-azure-disk-resize-validate to release/2.2.0 
* commit '4ae235570df4f25c1b0d6b67a5cdc1132a589b10':
  根据Azure主机状态判断磁盘是否可以resize
 2018-11-12 22:03:25 +08:00
邱剑 86dd2125f1 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'c2bc969070c2f14a796255c6fcbe01528a8ebf2e':
  根据Azure主机状态判断磁盘是否可以resize
 2018-11-12 22:03:25 +08:00
邱剑 737894f5cb Merge pull request #472 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-disk-resize-validate to release/2.1.0 
* commit '593e8c9fd8162b1eb5f3c9d74748070f4b139113':
  根据主机状态判断磁盘是否可以resize
 2018-11-12 22:03:03 +08:00
邱剑 bde729b202 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '737894f5cb418b3f65400939da18551befa10fd2':
  根据主机状态判断磁盘是否可以resize
 2018-11-12 22:03:03 +08:00
邱剑 f5529c14f7 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'bde729b202162ebfad989a79071891840e163113':
  根据主机状态判断磁盘是否可以resize
 2018-11-12 22:03:03 +08:00
屈轩 fbf5f6825f 根据腾讯云主机状态判断磁盘是否可以resize 2018-11-12 21:52:25 +08:00
屈轩 4ae235570d 根据Azure主机状态判断磁盘是否可以resize 2018-11-12 21:46:11 +08:00
屈轩 593e8c9fd8 根据主机状态判断磁盘是否可以resize 2018-11-12 21:28:50 +08:00
李泽玺 6301b2b6af Merge pull request #467 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-schedule-disk to release/2.3.0 
* commit '0244e70516fa14222350673c757ba279d687eb27':
  support schedule disk
 2018-11-12 21:16:39 +08:00