Commit Graph
1366 Commits
Author SHA1 Message Date
周有松 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
TangBin 69c14a20b1 add azure metadatas 2018-11-02 15:50:57 +08:00
TangBin 79ba3e44c8 add aliyun tag 2018-11-02 15:28:19 +08:00
Yousong Zhou 15f00ca67a loadbalancers: check affiliations between backendgroups and loadbalancers 2018-11-02 06:01:08 +00:00
屈轩 fe0a36919c 解决冲突 2018-11-02 13:56:54 +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
Zexi Li af97ebe0bc climc: k8s-repo-sync 2018-11-02 12:36:51 +08:00
屈轩 ccc934c20f 添加EIP sync日志 2018-11-02 12:22:13 +08:00
TangBin 94dfab5663 bugfix 2018-11-02 11:36:16 +08:00
Qiu Jian c303afcb46 增加keystone project add tag接口支持 2018-11-01 22:30:13 +08:00
wanyaoqi af9edf142c snaphost list add guest_id disk_name 2018-11-01 21:28:52 +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
TangBin 914a8889bd add aws tags 2018-11-01 20:07:30 +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
Zexi Li dfe8d26da5 fix: region disk specs 2018-11-01 17:04:34 +08:00
Zexi Li c2e628d6ef climc: helm release app 2018-11-01 16:31:29 +08:00
TangBin bbcaf0084c read aws instance type from file 2018-11-01 15:41:32 +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
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
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
TangBin 350caaeac8 add todo 2018-10-31 19:06:48 +08:00
Qiu Jian e83e1966d2 policyManager增加IsAdminCapable接口 2018-10-31 18:38:19 +08:00
TangBin 96ef49c478 zone bugfix 2018-10-31 18:18:20 +08:00
屈轩 c8b52b0850 修复同步rule规则时未处理好port内容 2018-10-31 18:13:02 +08:00
TangBin 2971c91908 eip bugif 2018-10-31 18:06:45 +08:00
TangBin 64a0960697 eip bugfix 2018-10-31 17:58:15 +08:00
wanyaoqi 3bfc2951fe snapshot log event for billing 2018-10-31 17:42:28 +08:00
TangBin e9bec7e151 bugfix 2018-10-31 17:10:19 +08:00
TangBin 0b09372ffa bugfix 2018-10-31 17:07:53 +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
邱剑 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
TangBin dbd0c1b9e0 add todo 2018-10-31 14:33:31 +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