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
TangBin 5f5a0e2fb7 add more log & fix YunionSecRuleToAws\ 2018-11-13 20:14:06 +08:00
TangBin f62c5fa22e snapshot region id bugfix 2018-11-13 19:19:04 +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
邱剑 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
TangBin 538ee71202 snapshot delete & disk reset 2018-11-13 17:45:53 +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
TangBin 826717129b add more log 2018-11-13 15:57:05 +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
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
邱剑 caa2c7b7c0 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'ce24455d1ba3931e66954cc5603adca765a26306':
  Azure挂载卸载磁盘更改lun有可能会失败
 2018-11-13 12:00:40 +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
邱剑 0c9d65cdad Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'dbbcb7a4be018e97ff57606ce99e068ee54cbdfe':
  在线更改配置，不需要等待虚机状态为ready
 2018-11-13 11:39:02 +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
邱剑 b8bd00bf06 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '84d7e390d476c53d19bb7a2f6cb67537645b693a':
  修正：host undo convert失败
 2018-11-13 11:38:02 +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
邱剑 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
唐斌 4a77357e44 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'b1acc90be367eca2a686a9360f72591356cbe832':
  rm transitive dependents
  fix depends
  fix region-dns build error
 2018-11-13 10:51:12 +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
邱剑 ca5571e383 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'bc66c01ef343b4de09d341079041cd21294f3e38':
  根据腾讯云主机状态判断磁盘是否可以resize
 2018-11-12 22:03:46 +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
邱剑 c03130fe9c Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '86dd2125f16b344c922cbcab831da2378023dee7':
  根据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
邱剑 85789abc1e Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'f5529c14f70e92f2e5d9f4c702815466cd78066d':
  根据主机状态判断磁盘是否可以resize
 2018-11-12 22:03:04 +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
李泽玺 9ea481119d Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '6301b2b6af53ac7422659bb72be2a87e0523bbcf':
  support schedule disk
 2018-11-12 21:16:40 +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
李泽玺 d6770c0073 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '2a220c7f6ebdd212a7db50a8d6dbdc18ea7ad69e':
  修正：如果policy blob错误，则无法修改和删除policy
 2018-11-12 20:41:50 +08:00
李泽玺 2a220c7f6e Merge pull request #470 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-fix-policy-fail-update to release/2.3.0 
* commit 'c6ae93a2eacd214f29b2d930f621d69cf474d023':
  修正：如果policy blob错误，则无法修改和删除policy
 2018-11-12 20:41:49 +08:00
Qiu Jian c6ae93a2ea 修正：如果policy blob错误，则无法修改和删除policy 2018-11-12 20:39:54 +08:00
邱剑 06ee675896 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'c6af80d1247c41ee4903ab2cc89c7f11a14cefb1':
  适配腾讯云AWS主机操作状态
 2018-11-12 20:13:47 +08:00