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
9,767 Commits 30 Branches 714 Tags
98fcd1df0f1158e5184a0a33bfda170bae76f7e5
Commit Graph
6987 Commits
Author SHA1 Message Date
李泽玺 305714beee Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'ac620132dd956dbf6c9afca180f66c0c9a5218d9':
  schedule k8s local volume
  region-dns: use k8s.SKubeClusterManager
 2018-11-15 11:50:24 +08:00
李泽玺 ac620132dd Merge pull request #506 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-k8s-pv-sched to release/2.3.0 
* commit '8d7360298f3c4fcd03b44719f519082c3ad118e7':
  schedule k8s local volume
  region-dns: use k8s.SKubeClusterManager
 2018-11-15 11:50:24 +08:00
Zexi Li 8d7360298f schedule k8s local volume 2018-11-15 11:49:19 +08:00
邱剑 b01532929c Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'acb34e697b4628417c531890c83b7f87cc09babc':
  避免更新Azure disk名称
 2018-11-15 11:16:21 +08:00
邱剑 acb34e697b Merge pull request #505 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-resolve-conflict-20181115-2.3.0 to release/2.3.0 
* commit 'bfdb74bcfd087abe38c7e13bee095cbf42634107':
  避免更新Azure disk名称
 2018-11-15 11:16:20 +08:00
邱剑 7fe534de05 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '73e753beb76aba7ea7374f8c344c6a5b270bf3ea':
  优化腾讯云请求失败重试
 2018-11-15 11:13:56 +08:00
邱剑 73e753beb7 Merge pull request #498 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-qcloud-request-optimization to release/2.3.0 
* commit '5e19f0b0c1e04521a4002e4a2be79b4929b91fac':
  优化腾讯云请求失败重试
 2018-11-15 11:13:56 +08:00
Qiu Jian bfdb74bcfd Merge branch 'release/2.2.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20181115-2.3.0 
Conflicts:
	pkg/compute/hostdrivers/base.go
 2018-11-15 11:12:07 +08:00
邱剑 44801052b5 Merge pull request #500 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-azure-disk-name-change to release/2.2.0 
* commit 'b4c3ce139fa2a2f6a7c932ac2bee0b9c36b3651f':
  避免更新Azure disk名称
 2018-11-15 11:08:22 +08:00
邱剑 15dfd15ae2 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'b8e79d867510cfba33a8d640774e29790027aa39':
  避免覆盖本地templateId
 2018-11-15 11:08:03 +08:00
邱剑 b8e79d8675 Merge pull request #503 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-disk-templateid-sync to release/2.3.0 
* commit '97f1d1c150f93292234761642e7863b19214aa58':
  避免覆盖本地templateId
 2018-11-15 11:08:03 +08:00
屈轩 97f1d1c150 避免覆盖本地templateId 2018-11-15 11:01:33 +08:00
邱剑 56a65cc909 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'e9ce0dee68e059a52e33ed70efdb88904f7d4f65':
  修正：aliyun磁盘创建后，将image external id同步为template id，导致找不到对应的image，导致启动失败
 2018-11-15 10:22:43 +08:00
邱剑 e9ce0dee68 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '6dac339898e89d30729ccf49a0225420f075b1d8':
  修正：aliyun磁盘创建后，将image external id同步为template id，导致找不到对应的image，导致启动失败
 2018-11-15 10:22:42 +08:00
Qiu Jian faae16c1d1 修正：aliyun磁盘创建后，将image external id同步为template 
id，导致找不到对应的image，导致启动失败
 2018-11-15 01:19:30 +08:00
Zexi Li 43255fe7e8 region-dns: use k8s.SKubeClusterManager 2018-11-15 00:41:06 +08:00
邱剑 41bcde8219 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '33f744e21aece9315ac5aed3d937d6df9ed33d9d':
  修正：普通用户无法访问admin权限的资源
 2018-11-14 22:46:45 +08:00
邱剑 33f744e21a Merge pull request #501 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-fix-rbac-bug-20181114 to release/2.3.0 
* commit '0ed39ff2c9ff39c71c76e26241bc86f4df3c5166':
  修正：普通用户无法访问admin权限的资源
 2018-11-14 22:46:44 +08:00
Qiu Jian 0ed39ff2c9 修正：普通用户无法访问admin权限的资源 2018-11-14 22:30:17 +08:00
屈轩 b4c3ce139f 避免更新Azure disk名称 2018-11-14 21:48:14 +08:00
邱剑 27b2b90853 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '68b9756787ba465d3f5a84167eca41847b684e29':
  避免更新Azure guest名称
 2018-11-14 21:31:37 +08:00
邱剑 3d13c99799 Merge pull request #499 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-azure-name-change to release/2.2.0 
* commit '0764bed0864c4de66273ed713a6ee519890128a2':
  避免更新Azure guest名称
 2018-11-14 21:31:36 +08:00
邱剑 68b9756787 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '3d13c99799c7c73f86b4aeb32a946e3b2eea9ab0':
  避免更新Azure guest名称
 2018-11-14 21:31:36 +08:00
屈轩 0764bed086 避免更新Azure guest名称 2018-11-14 21:24:50 +08:00
屈轩 5e19f0b0c1 优化腾讯云请求失败重试 2018-11-14 20:56:17 +08:00
邱剑 e80b5987ff Merge pull request #485 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:feature/yousong-climc-version-list to release/2.4.0 
* commit 'e11a46058594e8c3a1abba6c7f2410792844417b':
  climc: add commands yunionagent-version-list, yunionagent-version-show
 2018-11-14 20:48:51 +08:00
TangBin ebbedb9458 vpc & securtiy group sync 2018-11-14 20:32:16 +08:00
邱剑 dedbb3848e Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'f72ee1063fc29b2c840648c143c7c3dfb6d578cb':
  避免Azure绑定秘钥时stop机器
  更新Azure密钥后直接返回
 2018-11-14 16:15:56 +08:00
邱剑 f72ee1063f Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'f18eb7ddec21a3016fbd698cf5a7fa4c6e3603d2':
  避免Azure绑定秘钥时stop机器
  更新Azure密钥后直接返回
 2018-11-14 16:15:55 +08:00
TangBin 74c024c52e add latitude & longitude info 2018-11-14 15:45:14 +08:00
屈轩 ea620ef7ca 避免Azure绑定秘钥时stop机器 2018-11-14 15:40:52 +08:00
屈轩 5c09c64644 更新Azure密钥后直接返回 2018-11-14 15:28:13 +08:00
邱剑 88ebe6fed8 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'b2ffa81af90bb330b42d212edb11f55da40334be':
  优化azure secgroup规则同步
 2018-11-13 22:03:33 +08:00
邱剑 82fe6e2d45 Merge pull request #494 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-azure-secgroup-optimization to release/2.2.0 
* commit '9737f65716f6780755b8e5bfc995938a5199094f':
  优化azure secgroup规则同步
 2018-11-13 22:03:32 +08:00
邱剑 b2ffa81af9 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '82fe6e2d45431cad88ead06298a107c9886d19dd':
  优化azure secgroup规则同步
 2018-11-13 22:03:32 +08:00
邱剑 04810d11c5 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '6ca618d539f2f61fdc8c19236aaba4dca0769683':
  优化cloudprovider删除enable、disable逻辑
 2018-11-13 22:02:25 +08:00
邱剑 6ca618d539 Merge pull request #487 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-cloudaccount-optimization to release/2.3.0 
* commit '1ff0252f3f8ad3ae0db03d8f0d02c084270b5848':
  优化cloudprovider删除enable、disable逻辑
 2018-11-13 22:02:24 +08:00
邱剑 c169fdb8dc Automatic merge from release/2.0.0 -> release/2.1.0 
* commit '7d3b8ea610703af122b861a16bee85d9d31a5aea':
  添加更新操作后的操作
 2018-11-13 22:02:07 +08:00
邱剑 efb17ea441 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit 'c169fdb8dce18d1106d2db6f71b324e6bfc01fdf':
  添加更新操作后的操作
 2018-11-13 22:02:07 +08:00
邱剑 023fb8fa4a Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '50eebdd10d2a56bf6deb082877d944776065557b':
  添加更新操作后的操作
 2018-11-13 22:02:07 +08:00
邱剑 50eebdd10d Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'efb17ea441b34b078d36cbf32023ab8def0a6c92':
  添加更新操作后的操作
 2018-11-13 22:02:07 +08:00
邱剑 c0c6ae3d45 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'f69fbeaee75b4dc4673d1b05c5950d75a724b7b7':
  修正：1. rbac禁止所有的创建 2. 增加rbac_debug日志选项
 2018-11-13 22:01:18 +08:00
邱剑 f69fbeaee7 Merge pull request #488 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-rbac-deny-any-create to release/2.3.0 
* commit '1a53bba41f5172f65a051d6050a4aa0f7225c8b0':
  修正：1. rbac禁止所有的创建 2. 增加rbac_debug日志选项
 2018-11-13 22:01:18 +08:00
邱剑 8a146a92f9 Automatic merge from release/2.1.0 -> release/2.2.0 
* commit '11d305933001cdd41adde0cf3bb7d5c0319ade85':
  补充主机计费的shortdesc参数
 2018-11-13 22:01:03 +08:00
邱剑 21097e9f96 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '70e64329e93957a4772b468cfd7ad68c4ddf64e2':
  补充主机计费的shortdesc参数
 2018-11-13 22:01:03 +08:00
邱剑 70e64329e9 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '8a146a92f981d3fb318ab33fc2a0efde1ae77740':
  补充主机计费的shortdesc参数
 2018-11-13 22:01:03 +08:00
邱剑 11d3059330 Merge pull request #490 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-fix-server-short-desc to release/2.1.0 
* commit '36dda2a5b4ac268280c3e660d29666dcc6a68060':
  补充主机计费的shortdesc参数
 2018-11-13 22:01:02 +08:00
邱剑 c61a4c36c5 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '630b5df49e96d23d6b87a08fbd9572971be73587':
  修正：删除主机时忽略停机错误
  scheduler: filter host when cloudprovider status not connected
 2018-11-13 21:58:46 +08:00
屈轩 9737f65716 优化azure secgroup规则同步 2018-11-13 20:58:27 +08:00
屈轩 ab846cfad7 添加更新操作后的操作 2018-11-13 20:18:27 +08:00