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,229 Commits 27 Branches 687 Tags
182db4cd4e16a384be25ad05ffbe63df2a7f3efa
Commit Graph
1229 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
邱剑 182db4cd4e Merge pull request #451 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-disk-auto-delete to release/2.2.0 
* commit 'd73fd872273ea885334ffdfe8496a49cbeb6d936':
  跟随主机创建的磁盘，跟随主机删除
 2018-11-09 20:40:19 +08:00
屈轩 d73fd87227 跟随主机创建的磁盘，跟随主机删除 2018-11-09 20:30:56 +08:00
邱剑 568b46f209 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'e5a2a9e850720c398a9f3b6f7ac863a519bd8f77':
  fix: reverseproxy out of fds
 2018-11-09 17:14:39 +08:00
邱剑 e5a2a9e850 Merge pull request #448 in YUNIONIO/onecloud from ~LIZEXI/onecloud:hotfix/lzx-reverseproxy-out-of-fd to release/2.1.0 
* commit 'df1e3f1d47d2ea1aec604577e9b5b641b1019f67':
  fix: reverseproxy out of fds
 2018-11-09 17:14:38 +08:00
Zexi Li df1e3f1d47 fix: reverseproxy out of fds 2018-11-09 16:43:01 +08:00
邱剑 9f4ff99db8 Merge pull request #415 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/export-list-optimize to release/2.2.0 
* commit '721ac4b9121752ee1f47401f10e2af8ade8af382':
  optimize export list make dep
 2018-11-09 12:21:17 +08:00
wanyaoqi 721ac4b912 optimize export list 
make dep
 2018-11-09 11:55:31 +08:00
邱剑 1df1be46a8 Merge pull request #437 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-secgroup-tenantid-set to release/2.2.0 
* commit '5408a4cfc41e31eb374994257e0e9c92cb8a4167':
  同步安全组规则时携带项目信息
 2018-11-08 11:26:48 +08:00
屈轩 5408a4cfc4 同步安全组规则时携带项目信息 2018-11-08 11:23:55 +08:00
邱剑 83299b849b Merge pull request #435 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-glance-image-description to release/2.2.0 
* commit '3716e88878b3a545d96b5ce8d0936bd48608caa3':
  Image添加description字段
 2018-11-08 01:44:23 +08:00
屈轩 3716e88878 Image添加description字段 2018-11-07 17:56:28 +08:00
唐斌 b2320988c3 Merge pull request #425 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-minors-2.2 to release/2.2.0 
* commit '5299fd63c38445a7c42fa42a6983b2b154df2b5d':
  yunionconf: make qunar happy
 2018-11-05 16:34:06 +08:00
Yousong Zhou 5299fd63c3 yunionconf: make qunar happy 2018-11-05 08:30:41 +00:00
李泽玺 a5f9d9c687 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'b1dade9701606d505315271a09ef1c88cfc48827':
  2.0.0: make qunar happy
 2018-11-05 16:30:22 +08:00
李泽玺 a534b14586 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'a5f9d9c6871a2d29b6774cf609c87410e7222c7c':
  2.0.0: make qunar happy
 2018-11-05 16:30:22 +08:00
李泽玺 b1dade9701 Merge pull request #424 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-minors-2.0 to release/2.0.0 
* commit '1da2255d4f7c6289f2caa63fd5a6f8d8724bf84c':
  2.0.0: make qunar happy
 2018-11-05 16:30:21 +08:00
Yousong Zhou 1da2255d4f 2.0.0: make qunar happy 2018-11-05 08:27:14 +00:00
邱剑 7fb6e0e15e Merge pull request #421 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-aliyun-offset to release/2.1.0 
* commit '09d9990640f50ff4430ae703f9e8a1b6f3deef10':
  修复同步阿里云资源时出现重复资源问题
 2018-11-03 19:58:11 +08:00
邱剑 ad60672977 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '7fb6e0e15ed2d103b81f92ad37243032490a5553':
  修复同步阿里云资源时出现重复资源问题
 2018-11-03 19:58:11 +08:00
屈轩 09d9990640 修复同步阿里云资源时出现重复资源问题 2018-11-03 18:33:34 +08:00
邱剑 c22c05fe03 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '9277e350221d38f46af6c09491af50081e88c528':
  修复日志显示错误
 2018-11-03 17:31:15 +08:00
邱剑 9277e35022 Merge pull request #420 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-sync-log to release/2.1.0 
* commit 'f288d6b188c0f23cd86b90c849a6c091a6be33d4':
  修复日志显示错误
 2018-11-03 17:31:14 +08:00
屈轩 f288d6b188 修复日志显示错误 2018-11-03 17:02:28 +08:00
邱剑 99a3992ac9 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'e0869e9d8b5ca5963245afd73b82a6f927da94e4':
  更改validate rule data 方式
 2018-11-02 20:37:46 +08:00
邱剑 e0869e9d8b Merge pull request #411 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-secrule-validate to release/2.1.0 
* commit '7ac07a446366dd499562f667c7dab18704c66896':
  更改validate rule data 方式
 2018-11-02 20:37:45 +08:00
屈轩 7ac07a4463 更改validate rule data 方式 2018-11-02 13:44:04 +08:00
邱剑 c845dda83d Merge pull request #406 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/micro-fix191101 to release/2.2.0 
* commit 'af9edf142ccfb9eaf07732bd1bddbb03213dffa5':
  snaphost list add guest_id disk_name
  make dep
 2018-11-02 13:30:37 +08:00
邱剑 18484b9630 Merge pull request #408 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-eip-sync-log to release/2.1.0 
* commit 'ccc934c20f9c0dc1ce0bc10303b0fb4ccd1d2795':
  添加EIP sync日志
 2018-11-02 13:13:58 +08:00
邱剑 cedcfc1748 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '18484b96308ca6a1e654826894a5d62bc56e15e4':
  添加EIP sync日志
 2018-11-02 13:13:58 +08:00
屈轩 ccc934c20f 添加EIP sync日志 2018-11-02 12:22:13 +08:00
wanyaoqi af9edf142c snaphost list add guest_id disk_name 2018-11-01 21:28:52 +08:00
wanyaoqi 8ce76004d5 make dep 2018-11-01 21:25:40 +08:00
邱剑 6e10c699a6 Merge pull request #403 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-disk-spec to release/2.2.0 
* commit 'dfe8d26da5122582264fa94d58a83baad67f6982':
  fix: region disk specs
 2018-11-01 17:05:05 +08:00
Zexi Li dfe8d26da5 fix: region disk specs 2018-11-01 17:04:34 +08:00
邱剑 557d28244c Merge pull request #397 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/support-get-export-keys to release/2.2.0 
* commit '3151e782e990bdc9a815e64e26613982c72b931b':
  support export filter
 2018-10-31 19:50:30 +08:00
wanyaoqi 3151e782e9 support export filter 2018-10-31 19:48:10 +08:00
邱剑 13078eefc6 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'e1095c58433b9b8ec5ff62415c7fe0999bd82c50':
  修复同步rule规则时未处理好port内容
 2018-10-31 19:38:37 +08:00
邱剑 e1095c5843 Merge pull request #395 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-sync-rules to release/2.1.0 
* commit 'c8b52b0850f0aacee6cae5e55993d14e792a196c':
  修复同步rule规则时未处理好port内容
 2018-10-31 19:38:36 +08:00
屈轩 c8b52b0850 修复同步rule规则时未处理好port内容 2018-10-31 18:13:02 +08:00
邱剑 c6a13a6326 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '614768215739d1bc846c839a77fd55abee123c97':
  bugfix
  add rpc batch host create
 2018-10-31 17:03:34 +08:00
邱剑 fd4bc440f2 Merge pull request #389 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-batch-host-create to release/2.0.0 
* commit 'b64c6dc736e9d4c207a61d6c17f46bfffe00cccf':
  bugfix
  add rpc batch host create
 2018-10-31 17:03:33 +08:00
邱剑 6147682157 Automatic merge from release/2.0.0 -> release/2.1.0 
* commit 'fd4bc440f259874c3dd152ebe211408b1d820df2':
  bugfix
  add rpc batch host create
 2018-10-31 17:03:33 +08:00
李泽玺 4f0c608935 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '75f61cf9c86a0433b7f644d6ee1ac7e3ad79a889':
  region: usage support filter by project
 2018-10-31 12:11:38 +08:00
李泽玺 75f61cf9c8 Merge pull request #393 in YUNIONIO/onecloud from ~LIZEXI/onecloud:hotfix/lzx-resolve-conflict-2.1.0-20181031 to release/2.1.0 
* commit '7c04773c72c25fab9b602f5796f229b9613893e1':
  region: usage support filter by project
 2018-10-31 12:11:38 +08:00
Zexi Li 7c04773c72 Merge branch 'release/2.0.0' of ssh://git.yunion.io/~lizexi/onecloud into hotfix/lzx-resolve-conflict-2.1.0-20181031 2018-10-31 12:10:39 +08:00
邱剑 c20a18dea7 Merge pull request #390 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-bw-change to release/2.2.0 
* commit '5fe5c3c25b22c80a3a14d03b6f33589f3772714c':
  使用未更改前的bw作为old bw
 2018-10-31 11:32:06 +08:00
邱剑 5a85632e62 Merge pull request #391 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feautre/lzx-usage-by-project to release/2.0.0 
* commit '25c712e2131fb1e186c887ce1cdde39ed58a13f8':
  region: usage support filter by project
 2018-10-31 11:25:21 +08:00
Zexi Li 25c712e213 region: usage support filter by project 2018-10-30 21:39:50 +08:00
屈轩 5fe5c3c25b 使用未更改前的bw作为old bw 2018-10-30 20:06:27 +08:00
TangBin b64c6dc736 bugfix 2018-10-30 19:57:21 +08:00