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
邱剑 7feab1d5d0 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '77427a2d1ba197fc8781a21a5263dd230fb82fa3':
  bugfix
 2018-12-11 10:35:18 +08:00
邱剑 fcdc89610a Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '12776a4d48148c6c9eba301abf47756a31ff72c0':
  bugfix
 2018-12-11 10:35:18 +08:00
邱剑 77427a2d1b Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'fcdc89610a9e9c2bb4e33d624fa780e3efdde8a0':
  bugfix
 2018-12-11 10:35:18 +08:00
TangBin f4f117813a bugfix 2018-12-11 10:33:31 +08:00
Qiu Jian d8e35fb11a context中增加SAppParams参数，允许在Modal的方法里访问http请求参数，也能控制是否日志和trace 2018-12-10 23:39:30 +08:00
屈轩 44186f52a7 解决冲突 2018-12-10 20:10:51 +08:00
Qiu Jian c33fb7e283 updates 2018-12-10 20:05:20 +08:00
Qiu Jian dd15c8fdbe minor fixes 2018-12-10 20:03:06 +08:00
邱剑 2b183d5dd8 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '45936a8f4e9a068324863121fc650b1592b08a72':
  磁盘删除失败处理
 2018-12-10 20:01:20 +08:00
邱剑 2566cb54b4 Merge pull request #708 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-disk-delete to release/2.1.0 
* commit '113af069fee4b217a775590929537042c41e2c28':
  磁盘删除失败处理
 2018-12-10 20:01:19 +08:00
邱剑 45936a8f4e Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '2566cb54b410c4a64e1a2266c8db7d8ba4dd8519':
  磁盘删除失败处理
 2018-12-10 20:01:19 +08:00
邱剑 4251bb2cad Merge pull request #706 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-climc-dup-opt to release/2.4.0 
* commit 'e2fad5b29976c7f178d426dbb86fd44ed1e140f1':
  treewide: 改正structarg AddArgument()时Duplicate argument xxx错误
 2018-12-10 19:59:31 +08:00
屈轩 113af069fe 磁盘删除失败处理 2018-12-10 17:18:59 +08:00
屈轩 ff1ffff32a 避免stop失败后未SetStageFailed 2018-12-10 17:09:40 +08:00
Yousong Zhou e2fad5b299 treewide: 改正structarg AddArgument()时Duplicate argument xxx错误 2018-12-10 08:26:56 +00:00
Qiu Jian fc925e38ce Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-policy-cache 2018-12-10 15:36:18 +08:00
Qiu Jian da1efdaabf 增加policy缓存，降低日志量和计算量 2018-12-10 15:35:15 +08:00
屈轩 f1a75d4188 冲突解决 2018-12-10 15:04:45 +08:00
屈轩 02a10173a7 添加腾讯云计费信息 2018-12-10 14:58:31 +08:00
邱剑 e6bf848a55 Merge pull request #702 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-aws-support to release/2.4.0 
* commit 'bb2e1bb55055b6b4336a92790e1d6e25cb6b7bd5':
  network name bugfix
  cpu&mem list fix
  新建失败的主机不能正常删除bugfix
  security group name fix
  sync security group bugfix
 2018-12-10 14:57:59 +08:00
Qiu Jian 5759bf872a minor fixes 2018-12-10 11:05:04 +08:00
Qiu Jian 1df72fbc6b update usages 2018-12-10 10:45:29 +08:00
Qiu Jian cc7da24faa Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-vm-resource-pooling 2018-12-10 01:08:09 +08:00
Qiu Jian 00a17b360e update usage statics for prepaid-pool servers 2018-12-10 00:50:26 +08:00
邱剑 a04e92f707 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'd7597ab58e2bb6013c3ba748dd58abe0d62ec735':
  补充eip修改带宽验证代码
 2018-12-08 18:38:41 +08:00
屈轩 44196113d7 补充eip修改带宽验证代码 2018-12-08 18:36:14 +08:00
邱剑 28958add77 Merge pull request #699 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-resolve-conflict-2.4.0 to release/2.4.0 
* commit '43decfbc5f3be9b5f919bdb3be0e4a69ca8549f7':
  验证eip更改带宽
  验证eip更改带宽
 2018-12-08 18:31:32 +08:00
屈轩 43decfbc5f 冲突解决 2018-12-08 18:30:00 +08:00
邱剑 33cd6b7cdf Merge pull request #689 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-resouce-billing-info to release/2.4.0 
* commit 'c28e07ab7cdb91987a702cf7dca10ef216613677':
  recode, add subaccountproject
  标准化资源的计费字段信息
 2018-12-08 18:27:27 +08:00
屈轩 bd297ef3c9 Merge branch 'release/2.4.0' of ssh://git.yunion.io/~quxuan/onecloud into release/2.4.0 2018-12-08 18:26:46 +08:00
邱剑 6c79c66ef8 Merge pull request #697 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-validate-eip-change-bandwidth to release/2.2.0 
* commit 'c7166bb713fc5580ea45e6053901c55ff1a83304':
  验证eip更改带宽
 2018-12-08 18:25:51 +08:00
邱剑 2468a39a1b Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '6c79c66ef849e90bc8867b990c22938b05b5e6f5':
  验证eip更改带宽
 2018-12-08 18:25:51 +08:00
屈轩 c7166bb713 验证eip更改带宽 2018-12-08 18:10:07 +08:00
邱剑 e5b88b72e3 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'be95d3efc78f9552b2c1b79e2b1c59438df32b65':
  EIP详情添加公有云信息
 2018-12-08 18:00:57 +08:00
邱剑 7b31bd7b5d Merge pull request #696 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-eip-detail to release/2.2.0 
* commit 'bd77db90407e8276bfee9bf4633bcdfe388f745b':
  EIP详情添加公有云信息
 2018-12-08 18:00:57 +08:00
邱剑 be95d3efc7 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '7b31bd7b5d05ae242787e9396f6192c2feaa7a0a':
  EIP详情添加公有云信息
 2018-12-08 18:00:57 +08:00
邱剑 721d719c48 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '123fe0cee511887655687d34f1f9d3a044954b7b':
  补充eip带宽信息
 2018-12-08 18:00:38 +08:00
屈轩 089dd05ba3 Merge branch 'hotfix/qx-validate-eip-change-bandwidth' of ssh://git.yunion.io/~quxuan/onecloud into release/2.4.0 2018-12-08 17:28:29 +08:00
屈轩 4f5e5bac44 验证eip更改带宽 2018-12-08 17:28:08 +08:00
屈轩 bd77db9040 EIP详情添加公有云信息 2018-12-08 16:38:45 +08:00
屈轩 bfb18f766f 补充eip带宽信息 2018-12-08 16:24:46 +08:00
Qiu Jian c28e07ab7c recode, add subaccountproject 2018-12-08 14:37:57 +08:00
李泽玺 698ce1358b Merge pull request #694 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-climc-manager-apiv to release/2.4.0 
* commit 'c13c7da0a2bc07bf8969e49c30a1ffcce02a7cc7':
  climc: set default manager api version
 2018-12-08 12:37:16 +08:00
Qiu Jian b69bc264a2 修正：1. 多余1个磁盘的recycle主机创建失败 2018-12-08 10:29:16 +08:00
邱剑 defc221ec4 Merge pull request #4 in ~QIUJIAN/onecloud from ~LIZEXI/onecloud:feature/lzx-sched-resource-type to feature/qj-vm-resource-pooling 
* commit '4df0c08db849e94c3b36bff077c4c48cc5f11ff5':
  fix: scheduler not mark prepaid host dirty
 2018-12-08 09:39:17 +08:00
Zexi Li 4df0c08db8 fix: scheduler not mark prepaid host dirty 2018-12-08 00:57:23 +08:00
Zexi Li c13c7da0a2 climc: set default manager api version 2018-12-07 22:11:24 +08:00
Qiu Jian 75701657d0 fix bugs 2018-12-07 21:18:52 +08:00
邱剑 00211a9315 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '50a6cc21ab1e245bb74441abe795fce9bbba3d6e':
  fix: missing spec info when host list
 2018-12-07 20:27:54 +08:00
Zexi Li 2ea5517564 fix: missing spec info when host list 2018-12-07 20:26:21 +08:00