opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 14:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,024 Commits 27 Branches 687 Tags
bf55d0ef3ec246a18ceb044a7a211b673bc2f872
Commit Graph
1024 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
wanyaoqi bf55d0ef3e add server restart 2018-09-30 15:20:41 +08:00
邱剑 ec7f2ee981 Merge pull request #272 in YUNIONIO/onecloud from ~QUXUAN/onecloud:release/2.2.0 to release/2.2.0 
* commit '7c217bc49d7525050f73a87ec73866a642849be4':
  避免/tmp目录容量不够
 2018-09-30 12:13:34 +08:00
屈轩 7c217bc49d resolve conflict 2018-09-30 12:10:58 +08:00
邱剑 de7038f000 Merge pull request #238 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-save-image to release/2.1.0 
* commit '3eea07f2791c9251da1bb504bb3d07de5216b718':
  避免/tmp目录容量不够
 2018-09-30 12:05:40 +08:00
屈轩 3eea07f279 避免/tmp目录容量不够 2018-09-30 11:55:15 +08:00
邱剑 28f806819c Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'a563dc78e3740ddd13b9f39201e0f20820b37e4f':
  显示安全组规则
  fix: climc prompt for macos
 2018-09-30 10:27:31 +08:00
邱剑 a563dc78e3 Merge pull request #270 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-resolve-conflict-2.1.0-20180930 to release/2.1.0 
* commit '127302cb3be044a166b7f0b57b364f705ae6832e':
  显示安全组规则
  fix: climc prompt for macos
 2018-09-30 10:27:31 +08:00
Qiu Jian 127302cb3b Merge branch 'release/2.0.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.1.0-20180930 
Conflicts:
	pkg/compute/models/secgroups.go
 2018-09-30 10:21:22 +08:00
邱剑 306b9d770c Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'dcf7c00dcb3725e7745036e7c977d6fe4e06bcd7':
  添加超时处理
  添加admin参数
  支持ssh webconsole
 2018-09-30 10:15:24 +08:00
邱剑 dcf7c00dcb Merge pull request #259 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-webconsole to release/2.1.0 
* commit '28d59c5ebd6258a80b98e41b58038d098220d31a':
  添加超时处理
  添加admin参数
  支持ssh webconsole
 2018-09-30 10:15:24 +08:00
邱剑 1a36186284 Merge pull request #267 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-sec-detail to release/2.0.0 
* commit '8fc8d892fae001d5e5e988113a40d8bf4e1b84ad':
  显示安全组规则
 2018-09-30 10:15:01 +08:00
邱剑 3b2f688d80 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '6ec41ea388fcc9a50b4d412a842a788e482c18b9':
  添加region对guest统计数据
 2018-09-29 20:01:51 +08:00
邱剑 6ec41ea388 Merge pull request #261 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-region-guest to release/2.1.0 
* commit 'eb95ee71562c287c915cf4f4402bc71604bce3a0':
  添加region对guest统计数据
 2018-09-29 20:01:50 +08:00
李泽玺 fa1475132b Merge pull request #268 in YUNIONIO/onecloud from ~ZHENGJIAJIE/onecloud:feature/meter-dashboard-data-api to release/2.2.0 
* commit 'e15bcc9d371e828097b0be29de12ec35dbda5a09':
  add meter dashboard data api
 2018-09-29 19:33:59 +08:00
zhengjiajie e15bcc9d37 add meter dashboard data api 2018-09-29 19:20:09 +08:00
屈轩 8fc8d892fa 显示安全组规则 2018-09-29 18:23:22 +08:00
屈轩 28d59c5ebd 添加超时处理 2018-09-29 16:50:08 +08:00
张东亮 2439bafa3a Merge pull request #266 in YUNIONIO/onecloud from hotfix/rex-20180929-1455-fix-dep-ensure-issue to release/2.2.0 
* commit '2202f27fc8930a51687d2016a57f503a56d21971':
  dep ensure，解决依赖问题
 2018-09-29 15:49:49 +08:00
Zhang Dongliang 2202f27fc8 dep ensure，解决依赖问题 2018-09-29 14:56:00 +08:00
邱剑 9f84448d2e Merge pull request #260 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-resolve-conflict-2.1.0-20180928 to release/2.1.0 
* commit 'de45cf507ee02faffd595aba840ed7573c578a68':
  修正：伪删除虚拟机的时候，如果虚拟机停机失败，会真删除虚拟机
  Add baremetal agent support
 2018-09-29 12:32:30 +08:00
邱剑 32598e4f5d Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '9f84448d2e964869edb4ad27395b054cbc3fffe2':
  修正：伪删除虚拟机的时候，如果虚拟机停机失败，会真删除虚拟机
  Add baremetal agent support
 2018-09-29 12:32:30 +08:00
李泽玺 8b83cef272 Merge pull request #264 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-climc-prompt-macos-v210 to release/2.1.0 
* commit '6da9ea4a77c1a62daa9e8cc6e88a1e311b10e232':
  fix: climc prompt for macos
 2018-09-29 12:32:19 +08:00
李泽玺 84027cbe3f Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '8b83cef27239403dd23d76c6ae49c35753c2904b':
  fix: climc prompt for macos
 2018-09-29 12:32:19 +08:00
Zexi Li 6da9ea4a77 fix: climc prompt for macos 2018-09-29 12:31:13 +08:00
李泽玺 fc24fba1f7 Merge pull request #262 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-climc-prompt-macos to release/2.0.0 
* commit '1f13848418c2f7eb342beab06eb63193caf879aa':
  fix: climc prompt for macos
 2018-09-29 12:20:57 +08:00
Zexi Li 1f13848418 fix: climc prompt for macos 2018-09-29 12:19:48 +08:00
屈轩 eb95ee7156 添加region对guest统计数据 2018-09-29 11:50:13 +08:00
张东亮 51f5c45eb3 Merge pull request #256 in YUNIONIO/onecloud from feature/rex-autoupdate-20180928-1052 to release/2.2.0 
* commit '1bf947869322befa2811b8fbe55dd0dbbf81eb2d':
  autoupdate support for onecloud
 2018-09-29 09:47:37 +08:00
Qiu Jian de45cf507e Merge branch 'release/2.0.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.1.0-20180928 
Conflicts:
	pkg/compute/tasks/guest_delete_task.go
 2018-09-28 23:19:32 +08:00
邱剑 510b80dfeb Merge pull request #257 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-validators-struct to release/2.1.0 
* commit '8eac303dbfa6c89a8b5ecb86bd7ffee764306ae6':
  validators: ValidatorStruct: update input data with validated struct
 2018-09-28 14:06:12 +08:00
邱剑 0f4ce95f46 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '510b80dfeb1ee08be0dbfbc04140fc8e4073a82d':
  validators: ValidatorStruct: update input data with validated struct
 2018-09-28 14:06:12 +08:00
邱剑 a0cfe08cec Merge pull request #254 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-misc-fix-20180927 to release/2.0.0 
* commit '3ff40b817808b437863c2532a70fcb54cf8e5baa':
  修正：伪删除虚拟机的时候，如果虚拟机停机失败，会真删除虚拟机
  Add baremetal agent support
 2018-09-28 13:56:39 +08:00
Yousong Zhou 8eac303dbf validators: ValidatorStruct: update input data with validated struct 2018-09-28 04:07:57 +00:00
Zhang Dongliang 1bf9478693 autoupdate support for onecloud 2018-09-28 11:24:51 +08:00
邱剑 abd31a2fb8 Merge pull request #255 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-cloudprovider-sum-guest to release/2.1.0 
* commit '873724b1fbdef79890367951896768b24fd849e7':
  cloudprovider返回虚机数量信息
 2018-09-27 18:26:34 +08:00
邱剑 5f6033fcae Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'abd31a2fb8c9622d5b0d531b3df914101832eb33':
  cloudprovider返回虚机数量信息
 2018-09-27 18:26:34 +08:00
屈轩 873724b1fb cloudprovider返回虚机数量信息 2018-09-27 18:20:44 +08:00
Qiu Jian 3ff40b8178 修正：伪删除虚拟机的时候，如果虚拟机停机失败，会真删除虚拟机 2018-09-27 18:02:14 +08:00
邱剑 abb9cb6ea6 Merge pull request #251 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-azure-storageaccount to release/2.2.0 
* commit '23a4087c6c5c286be87ced31d248e8c65c473747':
  storageaccount要求全局名称唯一，并不是账号内名称唯一，创建前检查
 2018-09-27 17:38:34 +08:00
邱剑 944cf624b2 Merge pull request #249 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-azure to release/2.2.0 
* commit '072c4b8a1f741094b0040f2ed242933779ed23b1':
  全量同步时默认不创建默认resourcegroup,延迟到创建资源时创建
 2018-09-27 17:38:21 +08:00
Qiu Jian f80ebd9f91 Add baremetal agent support 2018-09-27 17:07:33 +08:00
邱剑 c2eaabf964 Merge pull request #253 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-interface to release/2.1.0 
* commit '03653febc708d5337024dc88aaaf2165c0d9c43d':
  补充modules interface
 2018-09-27 16:06:52 +08:00
邱剑 306569ddea Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'c2eaabf964a94923e62a82873bd792cb6d7888e2':
  补充modules interface
 2018-09-27 16:06:52 +08:00
屈轩 03653febc7 补充modules interface 2018-09-27 12:04:13 +08:00
屈轩 072c4b8a1f 全量同步时默认不创建默认resourcegroup,延迟到创建资源时创建 2018-09-27 10:20:43 +08:00
屈轩 23a4087c6c storageaccount要求全局名称唯一，并不是账号内名称唯一，创建前检查 2018-09-26 20:43:35 +08:00
邱剑 2e23a840ad Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '4e7702f0ae7a0ca5f70cf408d3129da76300ac61':
  避免私有云安全组规则下发不完成,ruleset后面补充
 2018-09-26 15:48:06 +08:00
邱剑 4e7702f0ae Merge pull request #250 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-secgroup to release/2.1.0 
* commit '13c576672baa713385c7a14fabf73aca4ec91f85':
  避免私有云安全组规则下发不完成,ruleset后面补充
 2018-09-26 15:48:06 +08:00
屈轩 13c576672b 避免私有云安全组规则下发不完成,ruleset后面补充 2018-09-26 15:30:39 +08:00
邱剑 8d2498f688 Merge pull request #248 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-notices-create-at-fix to release/2.2.0 
* commit '814badb3d40ce949d309c09f8f7348983a492ae0':
  fix
  fix created_at & add license
 2018-09-25 20:50:21 +08:00