邱剑
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
邱剑
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
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
TangBin
7d4faf7038
prepay vm bugfix
2019-02-25 16:01:18 +08:00
邱剑
f878b57fab
Merge pull request #1110 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-bugfix-misc-20190223 to release/2.6.0
...
* commit '4c2e9996c13ce2e75095b4cfa423faaf2b2ff326':
fix: schedule fail should post actionlog
fix: action log always success
fix: cannot undo recycle of expired prepaid vm
fix: eip support prepaid charge type
2019-02-25 15:25:29 +08:00
TangBin
65d1d72f98
add more log
2019-02-25 12:08:30 +08:00
邱剑
246f47a988
Merge pull request #1111 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/minor-20190223 to release/2.6.0
...
* commit '6e9d54c3f30017d804a7bb49f4517ae19a772c66':
fix purge backup guest
set http connect timeout
set default http client Timeout
2019-02-25 11:21:05 +08:00
TangBin
8c02f86eec
add more log && imcp bugfix
2019-02-25 10:27:30 +08:00
wanyaoqi
c60cffbfa3
set http connect timeout
2019-02-24 12:35:19 +08:00
wanyaoqi
0474dad972
set default http client Timeout
2019-02-23 22:27:50 +08:00
Qiu Jian
4c2e9996c1
fix: schedule fail should post actionlog
2019-02-23 21:01:05 +08:00
Qiu Jian
66634a4dfa
fix: eip support prepaid charge type
2019-02-23 18:45:04 +08:00
TangBin
129d568e59
rename min disk
2019-02-23 18:11:13 +08:00
TangBin
01b7c11aba
order fix
2019-02-23 17:59:32 +08:00
邱剑
ab61d33cf0
Merge pull request #1108 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-server-change-ipaddr-nolog to release/2.6.0
...
* commit '61a38457340fb147b2126fbfd3ba8af96b38ce59':
fix: add action log for server changing ipaddr
2019-02-23 10:17:09 +08:00
邱剑
4853efe7e7
Merge pull request #1094 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-huawei-region-bugfix to release/2.6.0
...
* commit '6f43c49bdc08a67e5fcc2daf740224988a445d9b':
不允许删除带快照的华为云硬盘
华为云删除硬盘时删除快照
华为云快照回滚bugfix
2019-02-22 21:24:11 +08:00
Qiu Jian
61a3845734
fix: add action log for server changing ipaddr
2019-02-22 21:22:45 +08:00
邱剑
0edeb53d28
update models with db.Update interface
2019-02-22 12:06:13 +08:00
邱剑
97247c4c82
Merge pull request #1092 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/switch-to-backup to release/2.6.0
...
* commit '9ca00e1646e299eb4a6fef7aa75b3457010e1845':
switch to backup add status
2019-02-21 20:43:12 +08:00
TangBin
6f43c49bdc
不允许删除带快照的华为云硬盘
2019-02-21 20:15:43 +08:00
TangBin
4f8a2fafa0
华为云删除硬盘时删除快照
2019-02-21 17:40:52 +08:00
邱剑
9e3bab240c
Automatic merge from release/2.5.0 -> release/2.6.0
...
* commit 'd84a5fc16a4aef6d0b71e8a27e4b935f881fd55f':
fix: esxi references2Objects refer nil objects
2019-02-21 12:34:02 +08:00
TangBin
92c647c0ba
华为云快照回滚bugfix
2019-02-21 11:39:24 +08:00
Qiu Jian
e4d1a7a21f
fix: build broken for changing GetNetworkOfIP to GetOnPremiseNetworkOfIP
2019-02-21 11:02:37 +08:00
Qiu Jian
72d8dd8961
fix: esxi references2Objects refer nil objects
2019-02-20 23:13:27 +08:00
邱剑
50d4e47869
Merge pull request #1079 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-recode-cloudprovider to release/2.6.0
...
* commit 'c0c88174592d2d9d22f45e3d05beb577fc324a74':
baremetal and host request IP from on premise network
do not checkout storage limit for none-on-premise cloud
fix host usable filter
make fmt
fix: list managed resources and associate resources with uniform filters
Recode cloudprovider/cloudproviderfactory
2019-02-20 22:00:26 +08:00
邱剑
ddc4624466
Merge pull request #1082 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/host-server-v2 to release/2.6.0
...
* commit '91f109977f65a9b6419975948ff2dd90fb61d649':
fix backup server
add backup delete status
fix create bakcup server and some bugs
bug fix
2019-02-20 19:56:24 +08:00
TangBin
9ff96c7cf1
fix huawei image upload
2019-02-19 20:06:23 +08:00
邱剑
09fbf49b2b
Merge pull request #1081 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-fix-huawei-native-image-not-found to release/2.6.0
...
* commit '766ad18d1a7704fddcd259ca6bea11181ac04975':
fix: fail to create huawei server with native image
2019-02-19 19:06:49 +08:00
Qiu Jian
766ad18d1a
fix: fail to create huawei server with native image
2019-02-19 18:07:15 +08:00
邱剑
fb4592a4fa
Automatic merge from release/2.4.0 -> release/2.5.0
...
* commit '6ec91d6f4dd6ebf539369987fd829738bb6c0cbf':
识别新版vmdk
2019-02-19 17:34:30 +08:00
邱剑
0b39fc47a8
Automatic merge from release/2.5.0 -> release/2.6.0
...
* commit 'fb4592a4fa9005503f87caacc7bcfd88fd8e5430':
识别新版vmdk
2019-02-19 17:34:30 +08:00
屈轩
323836b1f8
识别新版vmdk
2019-02-19 17:25:55 +08:00
Qiu Jian
4539aae4df
Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-recode-cloudprovider
2019-02-19 17:15:18 +08:00
Qiu Jian
6bb72482b9
fix: list managed resources and associate resources with uniform filters
2019-02-19 16:45:09 +08:00
TangBin
8fdc9ec93d
merge release/2.6.0
2019-02-19 09:26:56 +08:00
Qiu Jian
78dac22cda
Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-recode-cloudprovider
2019-02-18 23:21:56 +08:00
Qiu Jian
d32633dc95
Recode cloudprovider/cloudproviderfactory
2019-02-18 23:10:57 +08:00
邱剑
a4ce38c4fe
Merge pull request #1013 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-image-p2p-distribution to release/2.6.0
...
* commit '4c6f196ec541d1b8c8e2d79ea69c7bd7f9fcf1a6':
temp commit
minor updates
torrent recode
2019-02-18 23:03:55 +08:00
邱剑
e9e2dbaea1
Merge pull request #1024 in YUNIONIO/onecloud from ~QUXUAN/onecloud:feature/qx-oepnstack-stage2 to release/2.6.0
...
* commit 'f5f2addfd7ea634e598293a37879c251b9eea006':
避免部署主机失败后未设置external_id而删除主机失败
rebase 2.6.0
快照磁盘支持区分公有云私有云
openstack 同步flavor
openstack创建
2019-02-18 23:02:49 +08:00
wanyaoqi
ee69f890bd
bug fix
2019-02-18 21:09:09 +08:00
邱剑
23d883ceae
Automatic merge from release/2.5.0 -> release/2.6.0
...
* commit '274e31d858fb054a0ccda96a65f292df94727740':
通过provider is_public_cloud区分公有云私有云
2019-02-18 18:29:46 +08:00
TangBin
119516736c
add qcloud driver lb sync method && add comment
2019-02-18 17:46:24 +08:00
屈轩
2ffe44a383
通过provider is_public_cloud区分公有云私有云
2019-02-18 17:43:31 +08:00
TangBin
11f5b40b63
bugfix & comment fix
2019-02-18 17:14:14 +08:00
Qiu Jian
8e65f740cf
fix: build error because of notify and actionlog interface change
2019-02-18 15:25:53 +08:00
张东亮
cdb12a1354
Merge pull request #1063 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-logger-record-start-time to release/2.6.0
...
* commit '9f35039209c5a9251d05ad720012531a50f8cc8b':
add service tag for actionlog
make fmt
fix: logger did not record start time of events
2019-02-18 12:25:16 +08:00
邱剑
4ea4766930
Merge pull request #1048 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-huawei-stage-2.2-fix to release/2.6.0
...
* commit 'fa49e138f26fbeb21a193ef48befb98dcbe37f99':
update vendor & bugfix
bugfix
替换不必要的重复func
remove useless todo
rebuild root bugfix
server get disks fix
server delete etc fix
server delete etc fix
2019-02-18 10:44:43 +08:00
邱剑