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
4,737 Commits 30 Branches 714 Tags
a549cf6512ec057da83fcd488c7dfede9174703f
Commit Graph
3017 Commits
Author SHA1 Message Date
万垚奇 a549cf6512 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '441afb84a826b46ea578dda13399a47082ad1eac':
  避免插入异常数据
 2019-03-04 11:58:06 +08:00
万垚奇 441afb84a8 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '0a3a820e578b89ff3e20e31cde6643181d1f5844':
  避免插入异常数据
 2019-03-04 11:58:06 +08:00
万垚奇 0a3a820e57 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'fa53945d3fed352f73247fc7f99b03f4b71d8c2d':
  避免插入异常数据
 2019-03-04 11:58:06 +08:00
屈轩 2235e1210c 避免插入异常数据 2019-03-04 11:41:32 +08:00
邱剑 9d2e2189f6 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '61ef7058bd052198e52bd293ab41db56fa159930':
  create eip bugfix
 2019-03-04 09:30:53 +08:00
邱剑 61ef7058bd Merge pull request #1145 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-huawei-cn-north-4-create-eip-fix to release/2.6.0 
* commit 'a8cbf4549c625d7bc35242db9c038b4b15b00224':
  create eip bugfix
 2019-03-04 09:30:52 +08:00
邱剑 02e8d93fb0 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'ead2078868214f073c88eabfac206d50a7c609b7':
  创建openstack指定对应的主机
  更改命名方式
  虚拟zone
  获取所有项目
  避免同步相同的host
  过滤zone底下的host
 2019-03-03 19:28:45 +08:00
屈轩 7544a3daf1 创建openstack指定对应的主机 2019-03-03 15:02:17 +08:00
屈轩 fa008f4e58 解决冲突 2019-03-03 14:54:48 +08:00
tangbin a8cbf4549c create eip bugfix 2019-03-02 22:10:44 +08:00
屈轩 dc799abbc9 更改命名方式 2019-03-01 17:45:22 +08:00
屈轩 6063545a07 虚拟zone 2019-03-01 16:41:11 +08:00
屈轩 41404e19b1 获取所有项目 2019-03-01 15:53:55 +08:00
邱剑 9efe501319 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '4f6ac33f4cbb37447ab77274aa97e614d5e38149':
  server disk list add storage type
 2019-03-01 12:26:42 +08:00
wanyaoqi f171f9b935 server disk list add storage type 2019-03-01 11:53:55 +08:00
屈轩 7475aa0fb1 避免同步相同的host 2019-03-01 11:40:01 +08:00
屈轩 3ab8beee03 过滤zone底下的host 2019-03-01 11:35:10 +08:00
李泽玺 9d462d2a39 Merge pull request #1137 in YUNIONIO/onecloud from ~LIZEXI/onecloud:hotfix/lzx-baremetal-pxe-config to release/2.7.0 
* commit 'aeac6234d9135945ec705d564103d346b8bd97ab':
  修复: 非baremetal类型的物理机 PXE 启动会被错误更新
 2019-02-28 21:51:08 +08:00
Zexi Li 20d61c649b climc: kubeclusters check system cluster status 2019-02-28 21:49:35 +08:00
Zexi Li aeac6234d9 修复: 非baremetal类型的物理机 PXE 启动会被错误更新 2019-02-28 21:09:24 +08:00
Zexi Li fc3b748039 rbac: SharableVirtualResource only allow GET method 2019-02-28 20:59:49 +08:00
Zexi Li 9312401932 cloudcommon: virtualresource ProjectId visible when user list 2019-02-28 20:41:45 +08:00
邱剑 f0cc337aa0 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'bc9f9089f81025a4c2c20fec9999b58f53767ee6':
  限制endpoint范围
  支持openstack选择对应的endpoint类型
 2019-02-28 20:18:27 +08:00
屈轩 fcfbf69ab2 解决冲突 2019-02-28 20:16:34 +08:00
李泽玺 73d8cf11d9 Merge pull request #1123 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-cluster-api to release/2.7.0 
* commit 'b6fe9b80592be6a080c981c8af32a7ae293c5b84':
  k8s multi cluster api
 2019-02-28 16:20:28 +08:00
Zexi Li b6fe9b8059 k8s multi cluster api 2019-02-28 16:20:09 +08:00
屈轩 1c8eeb317a 限制endpoint范围 2019-02-28 15:50:55 +08:00
zhengjiajie 4f7f3dabce zhengjj-add-bill-cloudchecks 2019-02-28 15:45:48 +08:00
屈轩 e6bfe279a1 支持openstack选择对应的endpoint类型 2019-02-28 15:23:41 +08:00
Qiu Jian 0066830f37 feature: filter zones by city 2019-02-28 10:14:22 +08:00
万垚奇 4126021fb1 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '81a29c658eb73293bd31e9aac40db81240cb3f8c':
  fix: zone capability storagetypes filter out baremetal hosts
 2019-02-27 17:17:32 +08:00
Qiu Jian fe769b65b4 fix: zone capability storagetypes filter out baremetal hosts 2019-02-27 17:16:24 +08:00
邱剑 67c38efb96 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '217538624613f4c1c505b5a7dbd02e09d21bc42f':
  update vendor
  fix: break dependencies of climc/mcclient on compute/models
 2019-02-27 17:10:03 +08:00
邱剑 2175386246 Merge pull request #1128 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-mcclient-not-depends-on-compute-models to release/2.6.0 
* commit '17d506da5f0c1895932c937b7a82eb25bd32b6d4':
  update vendor
  fix: break dependencies of climc/mcclient on compute/models
 2019-02-27 17:10:03 +08:00
Qiu Jian df0474e25a fix: break dependencies of climc/mcclient on compute/models 2019-02-27 16:40:13 +08:00
邱剑 6c0db50bf9 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '1857b7f54d7d42c90cced5244783404f48bcba41':
  openstack支持选私有云套餐
 2019-02-27 16:11:47 +08:00
邱剑 1857b7f54d Merge pull request #1125 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-openstack-sku to release/2.6.0 
* commit 'c54c380f3f2824baee9d8e7f91b2795b714e10c3':
  openstack支持选私有云套餐
 2019-02-27 16:11:47 +08:00
邱剑 d700cb0162 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '4eb314ab5ea31d04b11e9dda35aa20d9afd5da3c':
  disable host reset iptables
  fix delete disk panic
 2019-02-27 16:10:04 +08:00
邱剑 4eb314ab5e Merge pull request #1127 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/minor-9102-20-72 to release/2.6.0 
* commit '54bdb435509f4100dc09b128166dcf6e94d175c1':
  disable host reset iptables
  fix delete disk panic
 2019-02-27 16:10:03 +08:00
wanyaoqi 54bdb43550 disable host reset iptables 2019-02-27 13:56:46 +08:00
wanyaoqi 4d21562556 fix delete disk panic 2019-02-27 13:50:35 +08:00
屈轩 c54c380f3f openstack支持选私有云套餐 2019-02-26 21:20:36 +08:00
邱剑 33f272eab3 Merge pull request #1121 in YUNIONIO/onecloud from ~TANGBIN/onecloud:feature/tb-add-sku-list-query-condition to release/2.7.0 
* commit 'ff26e3f1e60d615f2a193e4fc7a5f6da812e9c2b':
  skus extra details querys add cache
  sku list add more query
 2019-02-26 20:58:38 +08:00
TangBin ff26e3f1e6 skus extra details querys add cache 2019-02-26 20:56:29 +08:00
邱剑 8480790c1d Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '87c0e0b8982b06f7d9be8c044d6658affeba12ad':
  parameter create fix
 2019-02-26 19:37:04 +08:00
邱剑 87c0e0b898 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '08285e415710357952daf77c48e7a0c9b8eda5ee':
  parameter create fix
 2019-02-26 19:37:03 +08:00
TangBin ecc653f0a1 parameter create fix 2019-02-26 18:29:32 +08:00
TangBin 82db81debc sku list add more query 2019-02-26 17:47:38 +08:00
邱剑 6ced91d2db Merge pull request #1117 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-vmware-sync-hoststorage-ignore-storage to release/2.6.0 
* commit '59cab59e5ea800392c87e311d9e15ee7ea26aa17':
  fix: ignore syncing storage when syncing vmware hosts
 2019-02-25 17:31:42 +08:00
邱剑 2146728337 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '6ced91d2db24c7985266bd4e498ee38933ba428b':
  fix: ignore syncing storage when syncing vmware hosts
 2019-02-25 17:31:42 +08:00