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,053 Commits 27 Branches 687 Tags
5f8d6d5109c7dbbd4e058518cc1df444ba2b9972
Commit Graph
1053 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
邱剑 5f8d6d5109 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '21f1c5f15f775510f08659c5b7298f1adf0b7e0e':
  在VM的diskinfo详情中增加image_id和image信息
 2018-10-12 12:24:09 +08:00
邱剑 21f1c5f15f Merge pull request #288 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-guest-add-template-info to release/2.1.0 
* commit '7a557668faeb011b712c4abeead15eb46061695d':
  在VM的diskinfo详情中增加image_id和image信息
 2018-10-12 12:24:08 +08:00
Qiu Jian 7a557668fa 在VM的diskinfo详情中增加image_id和image信息 2018-10-11 23:28:03 +08:00
邱剑 f813b330d2 Merge pull request #285 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-task-notify to release/2.2.0 
* commit '84ee48335b8a644c3597fb47299280a30fd7c4e6':
  fix: region task notify not work
 2018-10-11 20:39:01 +08:00
Zexi Li 84ee48335b fix: region task notify not work 2018-10-11 19:04:11 +08:00
邱剑 360a38455f Merge pull request #284 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-azure-rebuild-root to release/2.2.0 
* commit '6433953d9fefa539e98ee323f905075187fc9d26':
  避免因publickey为空导致重装系统失败
 2018-10-11 18:11:03 +08:00
屈轩 6433953d9f 避免因publickey为空导致重装系统失败 2018-10-11 17:16:05 +08:00
邱剑 fed89b0db6 Merge pull request #283 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-azure-attach-disk to release/2.2.0 
* commit 'f702526c238132e101db002eb0529b63b925824f':
 2018-10-11 15:48:46 +08:00
邱剑 f702526c23 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'e865fc725ce4befd23b5934dcca1db304e54f45b':
  修复查询defautl region时guests count异常
 2018-10-11 12:21:01 +08:00
邱剑 9c8ad6fc82 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '53e1f07f18062d249a88da0fa274c3af11daa21e':
  允许list description
 2018-10-11 12:02:18 +08:00
邱剑 53e1f07f18 Merge pull request #282 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-list-description to release/2.1.0 
* commit 'd25f48f1de7d91dd1e8f7da1e378e86324d57ab4':
  允许list description
 2018-10-11 12:02:17 +08:00
屈轩 d25f48f1de 允许list description 2018-10-10 20:01:21 +08:00
邱剑 6fd50aac20 Merge pull request #281 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-network-list-by-type to release/2.2.0 
* commit 'f6b87be132258e01a97a0cf8de396648377ce9a8':
  network list by server_type
 2018-10-10 16:37:16 +08:00
Zexi Li f6b87be132 network list by server_type 2018-10-10 16:18:56 +08:00
李泽玺 df24f5b50f Merge pull request #280 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-get-sub-accounts to release/2.2.0 
* commit '120492b505541a2e4bf8cd661fea02fb8062ff12':
  统一返回格式
 2018-10-10 13:24:42 +08:00
屈轩 120492b505 统一返回格式 2018-10-10 13:21:59 +08:00
李泽玺 e715c53d5f Merge pull request #279 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-perform-class-action to release/2.2.0 
* commit '7b9e11a15de8f370e716ecc8017547b4fa870e15':
  perform class action 返回值为复数
 2018-10-10 12:07:49 +08:00
屈轩 7b9e11a15d perform class action 返回值为复数 2018-10-10 12:02:04 +08:00
邱剑 e865fc725c Merge pull request #278 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-region-guest-count to release/2.1.0 
* commit '749c1daac19f4f3a894488f80c1b212e9f168d6c':
  修复查询defautl region时guests count异常
 2018-10-09 21:59:37 +08:00
邱剑 1c9c74461c Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'e865fc725ce4befd23b5934dcca1db304e54f45b':
  修复查询defautl region时guests count异常
 2018-10-09 21:59:37 +08:00
屈轩 749c1daac1 修复查询defautl region时guests count异常 2018-10-09 21:56:39 +08:00
邱剑 877e8ed8f0 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '1116fda18bf93abb172abed5ade2758b451779ec':
  获取aliyun region经纬度
 2018-10-09 21:41:01 +08:00
邱剑 1116fda18b Merge pull request #277 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-latitude-longitude to release/2.1.0 
* commit '11e20cebc5adf3b8371807f8d486ef4ee422746c':
  获取aliyun region经纬度
 2018-10-09 21:41:01 +08:00
屈轩 11e20cebc5 获取aliyun region经纬度 2018-10-09 21:20:52 +08:00
邱剑 aaaae8292c Merge pull request #276 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-parameter-bugfix to release/2.2.0 
* commit '1ae56de92784d642406d7f7a96d062a064b3bf02':
  bugfix
 2018-10-09 21:11:00 +08:00
TangBin 1ae56de927 bugfix 2018-10-09 21:04:48 +08:00
李泽玺 fde651b32c Merge pull request #274 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-k8s-delete-nodes to release/2.2.0 
* commit '77f4c6435c1b87491ffe4a2d46d22dee69642774':
  climc: add k8s-cluster-delete-nodes
 2018-10-09 17:32:51 +08:00
Zexi Li 77f4c6435c climc: add k8s-cluster-delete-nodes 2018-10-09 16:40:48 +08:00
邱剑 adfb54b10f Merge pull request #273 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/server-restart to release/2.2.0 
* commit 'bf55d0ef3ec246a18ceb044a7a211b673bc2f872':
  add server restart
 2018-09-30 16:07:47 +08:00
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