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
4737 Commits
This Branch
This Branch
All Branches
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
万垚奇 fa53945d3f Merge pull request #1149 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-storagecache-insert to release/2.4.0 
* commit '2235e1210c33cd7c4c9bac6a09f01d74820eda5a':
  避免插入异常数据
 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
邱剑 ead2078868 Merge pull request #1147 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-conflict-openstack to release/2.6.0 
* commit '7544a3daf1c73b877b629b27d1dc1bfd1fc30471':
  创建openstack指定对应的主机
  更改命名方式
  虚拟zone
  获取所有项目
  避免同步相同的host
  过滤zone底下的host
 2019-03-03 19:28:44 +08:00
屈轩 7544a3daf1 创建openstack指定对应的主机 2019-03-03 15:02:17 +08:00
屈轩 fa008f4e58 解决冲突 2019-03-03 14:54:48 +08:00
邱剑 1b30ee1c0b Merge pull request #1142 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-openstack-zone to release/2.5.0 
* commit 'dc799abbc9ae099bc65829849d097a9d460e3ff9':
  更改命名方式
  虚拟zone
  获取所有项目
  避免同步相同的host
  过滤zone底下的host
 2019-03-02 23:39:11 +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
邱剑 4f6ac33f4c Merge pull request #1140 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/minor-20190301 to release/2.6.0 
* commit 'f171f9b935a69433f9e46e91912e48d2dbac83a9':
  server disk list add storage type
 2019-03-01 12:26:41 +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
李泽玺 97746178cd Merge pull request #1138 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-check-cluster-status to release/2.7.0 
* commit '20d61c649b86ee388765a9336528256115b86b48':
  climc: kubeclusters check system cluster status
 2019-02-28 21:50:33 +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
邱剑 85a76fcb4c Merge pull request #1136 in YUNIONIO/onecloud from ~LIZEXI/onecloud:hotfix/lzx-sharable-rbac to release/2.7.0 
* commit 'fc3b748039c55da5c65d4bbd7e233dd196866c7c':
  rbac: SharableVirtualResource only allow GET method
 2019-02-28 21:02:42 +08:00
Zexi Li fc3b748039 rbac: SharableVirtualResource only allow GET method 2019-02-28 20:59:49 +08:00
邱剑 912a385e5c Merge pull request #1135 in YUNIONIO/onecloud from ~LIZEXI/onecloud:hotfix/lzx-virtualres-projectid-visible to release/2.7.0 
* commit '9312401932f965b8d9bf251e4d27f67e42115c8f':
  cloudcommon: virtualresource ProjectId visible when user list
 2019-02-28 20:44:53 +08:00
Zexi Li 9312401932 cloudcommon: virtualresource ProjectId visible when user list 2019-02-28 20:41:45 +08:00
邱剑 bc9f9089f8 Merge pull request #1134 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/conflict-openstack to release/2.6.0 
* commit 'fcfbf69ab29e4208565d9434aeb6d7fa6939bf18':
  限制endpoint范围
  支持openstack选择对应的endpoint类型
 2019-02-28 20:18:27 +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
邱剑 e017bee835 Merge pull request #1131 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-openstack-endpoint-type to release/2.5.0 
* commit '1c8eeb317a698ff160c5c3e1ec957e7cd82d2a92':
  限制endpoint范围
  支持openstack选择对应的endpoint类型
 2019-02-28 20:13:18 +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
李泽玺 8e3e474ef5 Merge pull request #1132 in YUNIONIO/onecloud from feature/zhengjj-add-bill-cloudchecks to release/2.7.0 
* commit '4f7f3dabce42f6af71d27dc14a6aed53ec3fc868':
  zhengjj-add-bill-cloudchecks
 2019-02-28 16:05:01 +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
邱剑 bf764a84f5 Automatic merge from release/2.7.0 -> master 
* commit '3ed5b762b68abb13d71b8df2fc323789c251aa6f':
  feature: filter zones by city
 2019-02-28 10:56:55 +08:00
邱剑 3ed5b762b6 Merge pull request #1130 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-filter-zone-by-city to release/2.7.0 
* commit '0066830f37922ca09e972d83c46e153030a0b666':
  feature: filter zones by city
 2019-02-28 10:56:54 +08:00
Qiu Jian 0066830f37 feature: filter zones by city 2019-02-28 10:14:22 +08:00
万垚奇 3d86af9818 Automatic merge from release/2.7.0 -> master 
* commit '4126021fb1dfcf1340a5dec690dcce94c17685a8':
  fix: zone capability storagetypes filter out baremetal hosts
 2019-02-27 17:17:33 +08:00
万垚奇 81a29c658e Merge pull request #1129 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-zone-storagetypes-exclude-baremetal to release/2.6.0 
* commit 'fe769b65b46c7d54e0f69ec74acf48ddb0146152':
  fix: zone capability storagetypes filter out baremetal hosts
 2019-02-27 17:17:32 +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
邱剑 f3ffba97c4 Automatic merge from release/2.7.0 -> master 
* commit '67c38efb96b1d0f5837d1659bb38be8058cf1d14':
  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
邱剑 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
Qiu Jian 17d506da5f update vendor 2019-02-27 17:02:45 +08:00