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,584 Commits 27 Branches 687 Tags
07ddd4651e5affc8a018e69b8d4970211ea2cd82
Commit Graph
590 Commits
Author SHA1 Message Date
邱剑 07ddd4651e Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '9dcfc7215cea837fc60c7fe32c0c8217c572d205':
  添加Azure挂载磁盘时允许的虚机状态
 2018-11-10 17:58:15 +08:00
邱剑 9dcfc7215c Merge pull request #458 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-auzre-attach-disk to release/2.2.0 
* commit '22c8899f9c0860effc50091268d53225d39b89b9':
  添加Azure挂载磁盘时允许的虚机状态
 2018-11-10 17:58:15 +08:00
屈轩 22c8899f9c 添加Azure挂载磁盘时允许的虚机状态 2018-11-10 15:32:18 +08:00
邱剑 9c91085004 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '12a03a8f7deea52a25b293a9cf6ba5012359e636':
  避免调度到Azure经典类型主机上
 2018-11-10 15:30:31 +08:00
屈轩 84559581d4 避免调度到Azure经典类型主机上 2018-11-10 15:28:22 +08:00
屈轩 650a166e60 解决冲突 2018-11-10 14:38:28 +08:00
邱剑 04578af02d Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '2e7c12ba1bc21d9b50a7c00956d05e1971382f9f':
  挂载磁盘失败时自动解除与虚机的关系
 2018-11-10 14:31:12 +08:00
屈轩 46752230df 添加腾讯云可挂载磁盘虚机状态 2018-11-10 14:20:08 +08:00
屈轩 89574e954a 挂载磁盘失败时自动解除与虚机的关系 2018-11-10 13:55:21 +08:00
邱剑 492469887b Merge pull request #431 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-qcloud to release/2.3.0 
* commit 'aab792ffa8ee7f873ab24d5d9ae66bc7ef3ec548':
  添加部分aliyun操作
  支持腾讯云资源导入
 2018-11-10 13:35:05 +08:00
邱剑 fb6d1082af Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '182db4cd4e16a384be25ad05ffbe63df2a7f3efa':
  跟随主机创建的磁盘，跟随主机删除
  fix: reverseproxy out of fds
 2018-11-09 20:40:20 +08:00
邱剑 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
邱剑 f98c3275ba Merge pull request #446 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-resolve-conflict-20181109-2.3.0 to release/2.3.0 
* commit 'd00dd6c42aa191521031653242cf01d2a4c058b3':
  optimize export list make dep
 2018-11-09 15:39:50 +08:00
Qiu Jian d00dd6c42a Merge branch 'release/2.2.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20181109-2.3.0 
Conflicts:
	Gopkg.lock
	pkg/cloudcommon/db/modelbase.go
 2018-11-09 12:37:21 +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
Yousong Zhou 73ec3d67fa loadbalancers: show loadbalancer name for listener and backend group 2018-11-08 15:37:48 +00:00
Yousong Zhou 13bc224202 mcclient: loadbalancers: allow updating names 
- loadbalanceracls: allow updating only name
 2018-11-08 15:37:48 +00:00
Yousong Zhou 24172a26f4 loadbalancers: more compact backendGroup validation 2018-11-08 15:37:48 +00:00
邱剑 8ce134fc7e Merge pull request #438 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-secgroup-tenant to release/2.3.0 
* commit '77128909aeeece8cca66c7ff11366897b70ab050':
  同步安全组规则时携带项目信息
 2018-11-08 20:04:07 +08:00
邱剑 4b4dd155c7 Merge pull request #436 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-fix-rbac-owner-privilege to release/2.3.0 
* commit '1d0ad17e360de5bf7ac772d4e721985453be9708':
  fix format
  修正：增加owner级别权限，放置普通用户可以访问系统资源
 2018-11-08 19:59:50 +08:00
Zexi Li 6bf33cfed5 region: server-list add cdrom 2018-11-08 19:21:47 +08:00
屈轩 aab792ffa8 添加部分aliyun操作 2018-11-08 15:37:30 +08:00
邱剑 78b8294a82 Merge pull request #439 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-create-container-no-disk to release/2.3.0 
* commit 'e9095d4b1ba06de34c9e5b4acf3c584d1b2f73bd':
  region: no disks created when create container
 2018-11-08 11:59:16 +08:00
Zexi Li e9095d4b1b region: no disks created when create container 2018-11-08 11:55:13 +08:00
屈轩 77128909ae Merge branch 'release/2.3.0' of ssh://git.yunion.io/yunionio/onecloud into bugfix/qx-secgroup-tenant 2018-11-08 11:37:17 +08:00
屈轩 be3e4c6e38 同步安全组规则时携带项目信息 2018-11-08 11:31:17 +08:00
邱剑 0e5c80e35f Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '1df1be46a8fd98a63360b191dfe21eb3863bd3f1':
  同步安全组规则时携带项目信息
 2018-11-08 11:26:48 +08:00
屈轩 5408a4cfc4 同步安全组规则时携带项目信息 2018-11-08 11:23:55 +08:00
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
屈轩 9833767fb2 支持腾讯云资源导入 2018-11-03 17:32:54 +08:00
邱剑 c22c05fe03 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '9277e350221d38f46af6c09491af50081e88c528':
  修复日志显示错误
 2018-11-03 17:31:15 +08:00
邱剑 87f12b71b2 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'c22c05fe03b5e76b4beb62920240a055f784017e':
  修复日志显示错误
 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