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
1,523 Commits 30 Branches 714 Tags
1d0ad17e360de5bf7ac772d4e721985453be9708
Commit Graph
559 Commits
Author SHA1 Message Date
Qiu Jian 388b793490 修正：增加owner级别权限，放置普通用户可以访问系统资源 2018-11-08 01:36:19 +08:00
wanyaoqi fb18edce1b fix get vnc port error 2018-11-07 10:55:51 +08:00
Zexi Li 917e1ee954 region: container driver 2018-11-06 21:08:59 +08:00
Yousong Zhou afb881229d loadbalancerlisteners: return 409 on port conflict 2018-11-05 06:37:18 +00: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
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
周有松 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
屈轩 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
屈轩 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
邱剑 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
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
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
邱剑 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
屈轩 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
wanyaoqi 24c08ed178 server migrate all 
some bugfix
 2018-10-31 12:25:40 +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
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
邱剑 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
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
wanyaoqi 2874b808d8 fix perform action call allowfunc 2018-10-30 16:17:22 +08:00
李泽玺 2d8ab8722e Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '3a14eeb8426f14da5ceda0cd13b4df552b80ac1c':
  fix get qemu 2.12.1 vnc port error
 2018-10-30 15:24:20 +08:00
wanyaoqi 6959ae4da3 fix get qemu 2.12.1 vnc port error 2018-10-30 12:08:38 +08:00
Qiu Jian 33f546aafd 重构代码，将policy从db中分离出来，代码更干净一些 2018-10-30 00:12:19 +08:00
邱剑 926fc3a3dd Merge pull request #369 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-rbac-support to release/2.3.0 
* commit '5a8bd4848509782e3ce953e9faae864ee09a0d8b':
  改进：rpc支持
  make fmt
  remove slice nil check
  fix quota check rbac check logic
  增加 usages get 和 quotas get/update 的RBAC检查
  JointModel support
  改进：model资源支持rbac认证，需要打开enable_rbac选项，默认关闭。非model资源还不支持
 2018-10-29 22:22:31 +08:00
邱剑 88db5a8901 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'bf744d8429dfed9e905ad2b862e73e408f45e1f4':
  snapshot fixs
 2018-10-29 19:54:32 +08:00
wanyaoqi 724169ef44 snapshot fixs 2018-10-29 19:41:43 +08:00
Yousong Zhou 264e9dea6d loadbalancers: show backend group name on detailed list 2018-10-29 07:09:37 +00:00