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,511 Commits 30 Branches 714 Tags
ec88bf0adcef44ade90920e397cc28d40fffe623
Commit Graph
4511 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
屈轩 ec88bf0adc 统一aliyun登录用户名 2019-03-05 13:52:24 +08:00
屈轩 d6bec23039 使用公有云镜像时，正确设置登录用户名 2019-03-05 13:46:15 +08:00
邱剑 3cb501341a Merge pull request #1153 in YUNIONIO/onecloud from ~TANGBIN/onecloud:release/2.6.0 to release/2.6.0 
* commit 'f8c5b3c81241a330e667ac62e378b85af3194a69':
  upload image min disk fix
  create instance tips fix && min_ram fix
 2019-03-04 18:40:28 +08:00
TangBin f8c5b3c812 upload image min disk fix 2019-03-04 18:21:38 +08:00
TangBin 12c1bfb1d6 create instance tips fix && min_ram fix 2019-03-04 18:00:04 +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
邱剑 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
邱剑 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
邱剑 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
邱剑 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
屈轩 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
屈轩 1c8eeb317a 限制endpoint范围 2019-02-28 15:50:55 +08:00
屈轩 e6bfe279a1 支持openstack选择对应的endpoint类型 2019-02-28 15:23:41 +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
Qiu Jian fe769b65b4 fix: zone capability storagetypes filter out baremetal hosts 2019-02-27 17:16:24 +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 17d506da5f update vendor 2019-02-27 17:02:45 +08:00
Qiu Jian df0474e25a fix: break dependencies of climc/mcclient on compute/models 2019-02-27 16:40:13 +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
邱剑 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
邱剑 f643b5126e Merge pull request #1120 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-update-vendor-20190225 to release/2.6.0 
* commit '10e6df934f996466a6d6004a6ab01719052d0a32':
  update vendor
 2019-02-26 20:45:49 +08:00
邱剑 08285e4157 Merge pull request #1122 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-parameter-create-fix to release/2.5.0 
* commit 'ecc653f0a1de013d34da660e9494f51649fda0cc':
  parameter create fix
 2019-02-26 19:37:03 +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
Qiu Jian 10e6df934f update vendor 2019-02-26 00:33:37 +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
邱剑 044fbf14ac Merge pull request #1119 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-image-min-disk-in-mb to release/2.6.0 
* commit '329e394c45f41464ce26764fdb7b1ab8d70437b8':
  Remove virtualSize column from images_tbl
  fix: unify image.min_disk unit to MB
 2019-02-25 17:31:32 +08:00
邱剑 43be48cacc Merge pull request #1118 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-huawei-icmp-bugfix to release/2.6.0 
* commit '7d4faf7038223e6ecae1827c2504df9a4eeb663d':
  prepay vm bugfix
  add more log
  add more log  && imcp bugfix
 2019-02-25 17:31:10 +08:00
邱剑 842af422f9 Merge pull request #1116 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/host-server-v2 to release/2.6.0 
* commit 'd1a860d7e69eb72d8ba580d944dfc0853d9ffa3f':
  fix online resize task
  fix deploy bugs
 2019-02-25 17:14:59 +08:00
邱剑 f7dd98d486 Merge pull request #1115 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/minor-20190223 to release/2.6.0 
* commit '7425e13bc692f2f42d74be60e68a3b5d23649705':
  set http idle conn timeout
  add delete backup on switch
  add verify dirty servers
  minor fix
 2019-02-25 17:12:06 +08:00
Qiu Jian 329e394c45 Remove virtualSize column from images_tbl 2019-02-25 17:06:44 +08:00
Qiu Jian 92bfe69de1 fix: unify image.min_disk unit to MB 2019-02-25 17:04:51 +08:00
wanyaoqi 7425e13bc6 set http idle conn timeout 2019-02-25 16:40:28 +08:00