wanyaoqi
|
f226b08e7b
|
temp
|
2019-01-22 16:56:47 +08:00 |
|
wanyaoqi
|
6dd07b124a
|
temp
|
2019-01-22 16:56:47 +08:00 |
|
wanyaoqi
|
1451b1aeb8
|
fix code
|
2019-01-22 16:56:47 +08:00 |
|
wanyaoqi
|
2671ae6892
|
temp
|
2019-01-22 16:56:47 +08:00 |
|
wanyaoqi
|
ca725b7654
|
temp
|
2019-01-22 16:56:47 +08:00 |
|
wanyaoqi
|
9b7f468186
|
20181222: storageman interfaces, work manager refactor
|
2019-01-22 16:56:47 +08:00 |
|
wanyaoqi
|
a053e372ef
|
20181221 temp commit
|
2019-01-22 16:56:47 +08:00 |
|
wanyaoqi
|
5b16b5b423
|
20181220: centos guestfs, move utils to cloudcommon
|
2019-01-22 16:56:47 +08:00 |
|
wanyaoqi
|
a3feb6d5b9
|
temo
|
2019-01-22 16:56:47 +08:00 |
|
Zexi Li
|
0dc7e2bff6
|
add server Nic struct
|
2019-01-22 16:56:47 +08:00 |
|
Zexi Li
|
3baecbb91c
|
* move utils path
* update vendor
|
2019-01-22 16:56:47 +08:00 |
|
Zexi Li
|
c7d0a215f0
|
baremetal: megactl
|
2019-01-22 16:56:47 +08:00 |
|
Zexi Li
|
1dd89ffd59
|
baremetal related api
|
2019-01-22 16:56:47 +08:00 |
|
Zexi Li
|
07863a7d6f
|
baremetal prepare
|
2019-01-22 16:56:47 +08:00 |
|
Zexi Li
|
f64b7b8e5c
|
- support relay address
- ssh util
- baremetal tasks
|
2019-01-22 16:56:47 +08:00 |
|
Zexi Li
|
1aa39c54e1
|
baremetal register
|
2019-01-22 16:56:47 +08:00 |
|
Zexi Li
|
703b094a60
|
baremetal init
|
2019-01-22 16:56:47 +08:00 |
|
wanyaoqi
|
b8768291ed
|
temp commit
|
2019-01-22 16:56:47 +08:00 |
|
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 |
|