opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-05 23:41:47 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,499 Commits 30 Branches 714 Tags
ecfa2ea723cd454c45c4d54dfe019bbd0b3a148c
Commit Graph
1499 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
邱剑 ecfa2ea723 Merge pull request #422 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-climc-resource-fiter-and-cache to release/2.3.0 
* commit 'aa5dfb79272e728a1c7ba302eeaf9fdf711fee49':
  minor updates
  Add dynamic schedtag show command
  1. mcclient.resource增加readfilter和writerfilter，允许为resource增加自定义字段 2. 增加mcclient的获取的缓存，方便缓存mcclient拉取资源
 2018-11-04 10:08:17 +08:00
Qiu Jian aa5dfb7927 minor updates 2018-11-04 01:42:33 +08:00
Qiu Jian 57203202ec Add dynamic schedtag show command 2018-11-04 01:13:07 +08:00
邱剑 b399237169 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'ad60672977714ed96738f91aef365e96d971050a':
  修复同步阿里云资源时出现重复资源问题
 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
邱剑 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
Qiu Jian bf456729fe 1. 
mcclient.resource增加readfilter和writerfilter，允许为resource增加自定义字段
2. 增加mcclient的获取的缓存，方便缓存mcclient拉取资源
 2018-11-03 19:53:53 +08:00
屈轩 09d9990640 修复同步阿里云资源时出现重复资源问题 2018-11-03 18:33:34 +08:00
邱剑 87f12b71b2 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'c22c05fe03b5e76b4beb62920240a055f784017e':
  修复日志显示错误
 2018-11-03 17:31:15 +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
邱剑 850c46cf83 Merge pull request #418 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-resolve-conflict-20181102-2.3.0 to release/2.3.0 
* commit '630ad7c526ea26432e73c416640a123c95199679':
  更改validate rule data 方式
 2018-11-03 13:36:16 +08:00
邱剑 96bc0c5cdb Merge pull request #419 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-scheduler-add-ssl-support to release/2.3.0 
* commit '7e463a4644fc774061305fcacfc82f3722947ce4':
  hack: scheduler ping/version escape auth
  make reverse proxy insecure ssl (for influxdb)
  make webconsole ssl capable
  scheduler add ssl support
 2018-11-03 13:33:19 +08:00
李泽玺 95a9691423 Merge pull request #414 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-dns-kube-autoconf to release/2.3.0 
* commit '2bef47d456852436f590c275b0c0194ce22a5784':
  region-dns: auto k8s config from kube server
 2018-11-03 13:19:17 +08:00
Qiu Jian 7e463a4644 hack: scheduler ping/version escape auth 2018-11-03 10:21:19 +08:00
Qiu Jian 732243efba make reverse proxy insecure ssl (for influxdb) 2018-11-03 10:01:06 +08:00
Qiu Jian 5a6b4832ea make webconsole ssl capable 2018-11-03 00:42:33 +08:00
Qiu Jian 0ad9260186 scheduler add ssl support 2018-11-02 22:20:38 +08:00
Qiu Jian 630ad7c526 Merge branch 'release/2.2.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20181102-2.3.0 
Conflicts:
	pkg/compute/models/secgrouprules.go
 2018-11-02 20:42:50 +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
邱剑 e095948e99 Merge pull request #407 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-project-add-tag to release/2.3.0 
* commit 'c303afcb4644e4fac09da0ca18a8a3ce18e5a144':
  增加keystone project add tag接口支持
 2018-11-02 20:34:37 +08:00
邱剑 d73cf3699e Merge pull request #416 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-endpoint-list to release/2.3.0 
* commit '85af9754d7f56f2d065011b44a43297271670b7d':
  climc: endpoint list by service id
 2018-11-02 20:34:19 +08:00
Zexi Li 85af9754d7 climc: endpoint list by service id 2018-11-02 20:32:56 +08:00
李泽玺 2952d4ab12 Merge pull request #409 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-helm-app to release/2.3.0 
* commit 'af97ebe0bc6cb68968f6d320a9b53284be9bdab8':
  climc: k8s-repo-sync
  climc: helm release app
 2018-11-02 16:55:03 +08:00
Zexi Li 2bef47d456 region-dns: auto k8s config from kube server 2018-11-02 16:25:03 +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
屈轩 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
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
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
Zexi Li c2e628d6ef climc: helm release app 2018-11-01 16:31:29 +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