opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 10:46:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,470 Commits 27 Branches 687 Tags
aab792ffa8ee7f873ab24d5d9ae66bc7ef3ec548
Commit Graph
1470 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
屈轩 aab792ffa8 添加部分aliyun操作 2018-11-08 15:37:30 +08:00
屈轩 9833767fb2 支持腾讯云资源导入 2018-11-03 17:32:54 +08:00
周有松 888b33998d Merge pull request #413 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-lb to release/2.3.0 
* commit '15f00ca67af44e8a289f829c2fdc090f06ef4d2c':
  loadbalancers: check affiliations between backendgroups and loadbalancers
 2018-11-02 16:12:21 +08:00
Yousong Zhou 15f00ca67a loadbalancers: check affiliations between backendgroups and loadbalancers 2018-11-02 06:01:08 +00:00
邱剑 363c0cfb80 Merge pull request #412 in YUNIONIO/onecloud from ~QUXUAN/onecloud:release/2.3.0 to release/2.3.0 
* commit 'fe0a36919c5e4648e7a0b7fa594ef8635a7e5a76':
  添加EIP sync日志
  snaphost list add guest_id disk_name
  make dep
 2018-11-02 14:00:39 +08:00
屈轩 fe0a36919c 解决冲突 2018-11-02 13:56:54 +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
邱剑 cedcfc1748 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '18484b96308ca6a1e654826894a5d62bc56e15e4':
  添加EIP sync日志
 2018-11-02 13:13:58 +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
屈轩 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
邱剑 5ce6eafb4e Merge pull request #380 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/server-migrate to release/2.3.0 
* commit '24c08ed178bd8b7411a0defc92dc7ab74ffc52fd':
  server migrate all some bugfix
 2018-11-01 21:19:18 +08:00
李泽玺 cf03f8d170 Merge pull request #405 in YUNIONIO/onecloud from ~LIZEXI/onecloud:hotfix/lzx-resolve-conflict-2.3.0-20181101 to release/2.3.0 
* commit 'f1fc6cfbb2e11efa684cc684f0b33e16ae352539':
  fix: region disk specs
 2018-11-01 17:13:09 +08:00
Zexi Li f1fc6cfbb2 Merge branch 'release/2.2.0' of ssh://git.yunion.io/~lizexi/onecloud into hotfix/lzx-resolve-conflict-2.3.0-20181101 2018-11-01 17:11: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
周有松 f7f9a9db4b Merge pull request #401 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-lb to release/2.3.0 
* commit 'fcc22850084cdf170ea0f569ac2823cfb3e6d22c':
  mcclient: options: listing loadbalancerlistenerrules with backendgroup as filter
  lbagent: specificity ordered rule routing
 2018-11-01 12:29:05 +08:00
Yousong Zhou fcc2285008 mcclient: options: listing loadbalancerlistenerrules with backendgroup as filter 2018-11-01 04:26:43 +00:00
张东亮 8d178fd9e5 Merge pull request #402 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-update-db-dep to release/2.3.0 
* commit '66865ef36bfe9d86ae9a64590676af65b932de86':
  bugfix db option
 2018-11-01 11:30:19 +08:00
TangBin 66865ef36b bugfix db option 2018-11-01 11:26:16 +08:00
Yousong Zhou 3768f05b62 lbagent: specificity ordered rule routing 2018-11-01 02:00:36 +00:00
邱剑 255f95f30f Merge pull request #400 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-lb to release/2.3.0 
* commit '03e2db7002fc0ccd2e6a97022ffd1a583b8b5f25':
  loadbalancerlistenerrules: return 409 on rule uniqueness check error
  loadbalancerlistenerrules: fix listing with --listener
 2018-10-31 20:20:38 +08:00
Yousong Zhou 03e2db7002 loadbalancerlistenerrules: return 409 on rule uniqueness check error 2018-10-31 12:16:41 +00:00
Yousong Zhou aefa36bd86 loadbalancerlistenerrules: fix listing with --listener 
internal error: getting model manager for "listener" failed"
 2018-10-31 12:12:53 +00:00
邱剑 4bae3769ca Merge pull request #394 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/snapshot-add-logevent to release/2.3.0 
* commit '3bfc2951fea69dfe3f5eda8baad9f1933cf15d5e':
  snapshot log event for billing
 2018-10-31 19:51:37 +08:00
邱剑 918f047cff Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '557d28244c144ac079fa3b5e12b2822c8988069a':
  support export filter
 2018-10-31 19:50:31 +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
邱剑 8ad2298b57 Merge pull request #396 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-policy-add-is_admin_capable to release/2.3.0 
* commit 'e83e1966d2804afe9f1057a1d4256f0cc4005fcf':
  policyManager增加IsAdminCapable接口
 2018-10-31 19:39:28 +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
邱剑 33863514be Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '13078eefc6b2775f21c5e7262c4d44dd1ebf62dc':
  修复同步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
Qiu Jian e83e1966d2 policyManager增加IsAdminCapable接口 2018-10-31 18:38:19 +08:00
屈轩 c8b52b0850 修复同步rule规则时未处理好port内容 2018-10-31 18:13:02 +08:00
wanyaoqi 3bfc2951fe snapshot log event for billing 2018-10-31 17:42:28 +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
邱剑 8e17da94f6 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'c6a13a63265d09ce4f78d6c6e5bd5e71c0277fa0':
  bugfix
  add rpc batch host create
 2018-10-31 17:03:34 +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
邱剑 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
wanyaoqi 24c08ed178 server migrate all 
some bugfix
 2018-10-31 12:25:40 +08:00
邱剑 a60a66e542 Merge pull request #385 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-recode-cloudcommon-options to release/2.3.0 
* commit '3a1264f8da7995e1333bfdb3a0bec3126585c6e8':
  调整cloudcommon的options数据结构，把数据库相关选项合并到DBoptions
 2018-10-31 12:23:36 +08:00
李泽玺 d3dd39f88f Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '4f0c608935b696dadc69abad67d593646c659d10':
  region: usage support filter by project
 2018-10-31 12:11:39 +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
邱剑 788861b402 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'c20a18dea762a30ceae5a1d754ec62361a1b268f':
  使用未更改前的bw作为old bw
 2018-10-31 11:32:06 +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
邱剑 099449efa3 Merge pull request #377 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-lb to release/2.3.0 
* commit '264e9dea6d61c33a82f640d585c19f7fb8b49a1e':
  loadbalancers: show backend group name on detailed list
  lbagent: add symlink to generated telegraf.conf
  lbagent: remove requirement on nmap-ncap
 2018-10-31 11:26:50 +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