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
3,842 Commits 27 Branches 687 Tags
fc7a9f37280cfd7d1caec8e89ef4ab1802faa08d
Commit Graph
3842 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
wanyaoqi fc7a9f3728 2018-12-17 ~ 81-21-8102 2019-01-22 16:56:47 +08:00
wanyaoqi c22561e9f5 temp 2019-01-22 16:56:47 +08:00
wanyaoqi f33a84fba5 2018-12-13 2019-01-22 16:56:47 +08:00
wanyaoqi 3c3a90b550 temp 2019-01-22 16:56:47 +08:00
wanyaoqi 1d2fe321d4 fix code 2019-01-22 16:56:47 +08:00
wanyaoqi 1bb42ae017 20181204-20181205 2019-01-22 16:56:47 +08:00
wanyaoqi cab32944b9 2018-12-04: init commit 2019-01-22 16:56:47 +08:00
邱剑 1cf002a143 Automatic merge from release/2.6.0 -> master 
* commit 'fe55edd79454a9449076be81c70074056d5d6fbe':
  避免project未找到直接返回err
 2019-01-22 16:30:35 +08:00
邱剑 fe55edd794 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '7934c01e08d9cb85013dfcde2caa7e1bda486488':
  避免project未找到直接返回err
 2019-01-22 16:30:35 +08:00
邱剑 7934c01e08 Merge pull request #960 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-conflict-2.5.0 to release/2.5.0 
* commit 'b9dd5052ca8db90cbb1f9897350e9a5c56089c20':
  避免project未找到直接返回err
 2019-01-22 16:30:35 +08:00
屈轩 b9dd5052ca 冲突解决 2019-01-22 16:29:08 +08:00
邱剑 6f732d1edc Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '0aafe01ee8d8934f54b75b1c2366c5dd72857101':
  避免project未找到直接返回err
 2019-01-22 16:18:37 +08:00
邱剑 0aafe01ee8 Merge pull request #955 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-project-sync to release/2.3.0 
* commit '3e4b8fed08e1011db9993e03ec7d63b12852031d':
  避免project未找到直接返回err
 2019-01-22 16:18:37 +08:00
屈轩 3e4b8fed08 避免project未找到直接返回err 2019-01-22 16:17:10 +08:00
邱剑 3813205663 Automatic merge from release/2.6.0 -> master 
* commit '562de369a231332e7c7e622e4805cc689b0f3d0b':
  fix account confilct
 2019-01-22 16:05:42 +08:00
邱剑 562de369a2 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit 'f552befc8f28c181ba899d403e9f2cb889abb946':
  fix account confilct
 2019-01-22 16:05:42 +08:00
邱剑 f552befc8f Merge pull request #958 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-cloudprovider-get-details-fix to release/2.5.0 
* commit 'aec207855282ef0627014df25f5aaf2e34fdfd21':
  fix account confilct
 2019-01-22 16:05:41 +08:00
TangBin aec2078552 fix account confilct 2019-01-22 15:51:32 +08:00
邱剑 cf9b8f29a2 Automatic merge from release/2.6.0 -> master 
* commit '1f203bda558304b34a234c1a6f9c2ed0adefdd0a':
  修复大小写错误
 2019-01-22 14:35:47 +08:00
邱剑 1f203bda55 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '8cb2f94a37d93147c0988002a1f60b51d0223305':
  修复大小写错误
 2019-01-22 14:35:46 +08:00
邱剑 8cb2f94a37 Merge pull request #956 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-typo to release/2.5.0 
* commit '26a9be5bee22d7f08bfe5ca127ce05558682da73':
  修复大小写错误
 2019-01-22 14:35:46 +08:00
屈轩 26a9be5bee 修复大小写错误 2019-01-22 14:14:22 +08:00
邱剑 f5b82f1dff Automatic merge from release/2.6.0 -> master 
* commit 'cd5b0b9781a53cfe31ee4dd0e63c6b5e66d271df':
  修复: webconsole 连接vnc设置 password 的虚拟机
 2019-01-21 20:29:01 +08:00
邱剑 cd5b0b9781 Merge pull request #948 in YUNIONIO/onecloud from ~LIZEXI/onecloud:hotfix/lzx-webconsole-vnc-passwd to release/2.6.0 
* commit '223c6d95a2541cb2c9734a3af43e164c50179bfc':
  修复: webconsole 连接vnc设置 password 的虚拟机
 2019-01-21 20:29:01 +08:00
Zexi Li 223c6d95a2 修复: webconsole 连接vnc设置 password 的虚拟机 2019-01-19 17:35:59 +08:00
邱剑 5b7c7ab244 Automatic merge from release/2.6.0 -> master 
* commit 'b78b90b99506863c822509bc25cc51cfe2cd4202':
  补充误删的access_url check
 2019-01-19 15:21:26 +08:00
邱剑 b78b90b995 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '7a5347420b22180e819ca1814c0e7025602dca38':
  补充误删的access_url check
 2019-01-19 15:21:26 +08:00
邱剑 7a5347420b Merge pull request #947 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-cloudaccount-dumplicate-check to release/2.5.0 
* commit '6f226e2dfd9da3169bb92b0a958d8f707acb252b':
  补充误删的access_url check
 2019-01-19 15:21:25 +08:00
屈轩 6f226e2dfd 补充误删的access_url check 2019-01-19 15:14:50 +08:00
邱剑 517b5d5630 Automatic merge from release/2.6.0 -> master 
* commit 'f61d9df75c179adb2a58587edc911b25e1263e94':
  修复openstack项目及用户名顺序颠倒问题
 2019-01-19 13:21:20 +08:00
邱剑 f61d9df75c Automatic merge from release/2.5.0 -> release/2.6.0 
* commit 'bbcea5e8dcdd310c39196732cc995fdb34201d37':
  修复openstack项目及用户名顺序颠倒问题
 2019-01-19 13:21:19 +08:00
邱剑 bbcea5e8dc Merge pull request #946 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-openstack-account to release/2.5.0 
* commit 'b16bc5d2cb39d912696f8503dfa3cc638e42fb8d':
  修复openstack项目及用户名顺序颠倒问题
 2019-01-19 13:21:19 +08:00
屈轩 b16bc5d2cb 修复openstack项目及用户名顺序颠倒问题 2019-01-19 13:18:47 +08:00
邱剑 a6a11ccb5e Automatic merge from release/2.6.0 -> master 
* commit '815bb2c72233fce51665feee61410304bf356d6f':
  避免传递tenant_id和onecloud api冲突
 2019-01-19 12:21:28 +08:00
邱剑 815bb2c722 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '56cd5919d673d92ece5df13a0672591098a74647':
  避免传递tenant_id和onecloud api冲突
 2019-01-19 12:21:28 +08:00
邱剑 56cd5919d6 Merge pull request #945 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-azure-directory_id to release/2.5.0 
* commit 'a1a04457790f390c03c582e681daf25a9505ebcd':
  避免传递tenant_id和onecloud api冲突
 2019-01-19 12:21:28 +08:00
屈轩 a1a0445779 避免传递tenant_id和onecloud api冲突 2019-01-19 12:20:45 +08:00
邱剑 306f7cc5d1 Automatic merge from release/2.6.0 -> master 
* commit '87e2a91875a11fe580ae9176f19e54942f2a3c22':
  增加缺少的参数
 2019-01-18 17:57:06 +08:00
邱剑 87e2a91875 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '69b35475345efb15b743d2afcca91830c4b90c79':
  增加缺少的参数
 2019-01-18 17:57:06 +08:00
邱剑 69b3547534 Merge pull request #944 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-climc-cloudaccount to release/2.5.0 
* commit '6debca92e51a8e2acb3daf5bf0cebf178bd0f7cd':
  增加缺少的参数
 2019-01-18 17:57:06 +08:00
屈轩 6debca92e5 增加缺少的参数 2019-01-18 17:55:36 +08:00
邱剑 f4d7fbcda8 Automatic merge from release/2.6.0 -> master 
* commit '7b0d548651ab455ba24c39ebe293b5c49f4125dd':
  取消重复的region信息
  返回eip账号信息
 2019-01-18 17:22:27 +08:00
邱剑 e3ddd6a201 Merge pull request #943 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-eip-more-details to release/2.5.0 
* commit '5c55f0633af1a750dbd6e28f6b759991fe3ea467':
  取消重复的region信息
  返回eip账号信息
 2019-01-18 17:22:26 +08:00
邱剑 7b0d548651 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit 'e3ddd6a201e8d98d4718a5aa17f86c11bd7c719c':
  取消重复的region信息
  返回eip账号信息
 2019-01-18 17:22:26 +08:00
屈轩 5c55f0633a 取消重复的region信息 2019-01-18 16:26:14 +08:00
屈轩 2c72ca35d3 返回eip账号信息 2019-01-18 16:25:13 +08:00
邱剑 7ee8f785b4 Automatic merge from release/2.6.0 -> master 
* commit 'b0a0ae12b89a935bd5a5ae1044ae9ec2968630bf':
  remove key index
 2019-01-18 16:03:11 +08:00
邱剑 b0a0ae12b8 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '3a47eef8585e103588f7b8c9e4bf9efdb1c96914':
  remove key index
 2019-01-18 16:03:11 +08:00
邱剑 3a47eef858 Merge pull request #942 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/remove-key-index to release/2.5.0 
* commit '2b4fac6a8755999b4132bf02e1e0a5b765efe4d9':
  remove key index
 2019-01-18 16:03:10 +08:00
邱剑 a2c57e135e Automatic merge from release/2.6.0 -> master 
* commit 'c7ac4531231e565edc2727293197bce5e3785f8f':
  climc 更新
  后端对公有云账号密码信息重组
 2019-01-18 14:44:22 +08:00