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
9,767 Commits 30 Branches 714 Tags
98fcd1df0f1158e5184a0a33bfda170bae76f7e5
Commit Graph
6987 Commits
Author SHA1 Message Date
李泽玺 e7bd71be2a Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '120d60ca2f41d056a8b1456bac74fe727467af50':
  fix: batch result include complete jsonerror instead of just details
 2019-02-21 12:33:54 +08:00
Qiu Jian 8e56608e54 fix: batch result include complete jsonerror instead of just details 2019-02-21 12:32:09 +08:00
wanyaoqi 9ca00e1646 switch to backup add status 2019-02-21 12:30:41 +08:00
李泽玺 c44cfe94d2 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '1417c63c52df591ff4e2b10cffdc4620d0ecb156':
  fix: isValidNetworkInfo return httperrors, should not be wrapped as a httperror again
 2019-02-21 12:27:13 +08:00
Qiu Jian 32299a1465 fix: isValidNetworkInfo return httperrors, should not be wrapped as a 
httperror again
 2019-02-21 12:20:43 +08:00
李泽玺 2a3f9596ba Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '695ed4cbd3f3b1c4b5ccd603c23668ae2acd55ad':
  fix: temporay auth failure may invalidate valid admintoken
 2019-02-21 12:10:30 +08:00
李泽玺 f8fef1f50a Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '2a3f9596bae4d0e754a75ebbe991b2164a610913':
  fix: temporay auth failure may invalidate valid admintoken
 2019-02-21 12:10:30 +08:00
李泽玺 695ed4cbd3 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '9e24e124f49123376490a091665e33c229a74db1':
  fix: temporay auth failure may invalidate valid admintoken
 2019-02-21 12:10:29 +08:00
Qiu Jian 588976672f fix: temporay auth failure may invalidate valid admintoken 2019-02-21 12:08:19 +08:00
邱剑 16aa2fd632 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '1a66c84d9f8dd493bbf4b9146f360405c8639dd4':
  fix import error
 2019-02-21 11:58:02 +08:00
TangBin 92c647c0ba 华为云快照回滚bugfix 2019-02-21 11:39:24 +08:00
wanyaoqi 66dac31341 fix import error 2019-02-21 11:10:08 +08:00
李泽玺 cec80a852e Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '2d38970567747585eb3ea652bbfb745876eae082':
  fix: build broken for changing GetNetworkOfIP to GetOnPremiseNetworkOfIP
 2019-02-21 11:05:12 +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
邱剑 5f1f335bca Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '50d4e47869897e4c890de108ed5774079ae9968d':
  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: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
邱剑 9a0d234db3 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'f0185430af477fd67db31811d1a6043ecd42c8c6':
  fix: Find network by Ip in on-premise networks only
 2019-02-20 21:59:33 +08:00
邱剑 f0185430af Merge pull request #1084 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-get-network-of-ip-on-premise to release/2.6.0 
* commit '7e00661e8ba5a409a9a1b9960024276984c5a8e4':
  fix: Find network by Ip in on-premise networks only
 2019-02-20 21:59:33 +08:00
邱剑 8d6b3ed899 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '3a40c5ed13b8404981e5dea3ea51433ba8c4313a':
  fix: adjust notify template
 2019-02-20 20:03:33 +08:00
邱剑 3a40c5ed13 Merge pull request #1086 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-adjust-notify-template to release/2.6.0 
* commit 'd3e1f325358bff3250dcae2c77d48411cb45075c':
  fix: adjust notify template
 2019-02-20 20:03:32 +08:00
邱剑 83baebe3e8 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'ddc4624466173531c5a20cf63fbe63508444ea8b':
  fix backup server
  add backup delete status
  fix create bakcup server and some bugs
  bug fix
 2019-02-20 19:56:25 +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
wanyaoqi 91f109977f fix backup server 2019-02-20 19:48:47 +08:00
Qiu Jian d3e1f32535 fix: adjust notify template 2019-02-20 16:18:13 +08:00
邱剑 ce130ae251 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'fc297b19ec0392c288bac50df21093be817f134f':
  fix huawei sync region
 2019-02-20 11:26:11 +08:00
TangBin cb1cf77c4e fix huawei sync region 2019-02-20 11:24:12 +08:00
wanyaoqi 0ad75780ee add backup delete status 2019-02-20 11:15:14 +08:00
Qiu Jian 7e00661e8b fix: Find network by Ip in on-premise networks only 2019-02-19 20:55:07 +08:00
邱剑 7919766f63 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '1e836f4e02020ae0ceb99e800648f350a34189f2':
  fix huawei image upload
 2019-02-19 20:15:37 +08:00
TangBin 9ff96c7cf1 fix huawei image upload 2019-02-19 20:06:23 +08:00
wanyaoqi 50a28caab4 fix create bakcup server and some bugs 2019-02-19 20:01:32 +08:00
Qiu Jian c0c8817459 baremetal and host request IP from on premise network 2019-02-19 19:11:56 +08:00
邱剑 2cb5392141 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '09fbf49b2bb9a6779ed56f922b731e7694918297':
  fix: fail to create huawei server with native image
 2019-02-19 19:06:49 +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 3b9db6a25b do not checkout storage limit for none-on-premise cloud 2019-02-19 18:13:14 +08:00
Qiu Jian 766ad18d1a fix: fail to create huawei server with native image 2019-02-19 18:07:15 +08:00
邱剑 61068feea1 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '0b39fc47a8083e1a9534e7bb4baffff4041ed2fa':
  识别新版vmdk
 2019-02-19 17:34:31 +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 81c85ca749 fix host usable filter 2019-02-19 17:14:26 +08:00
Qiu Jian 9b65a9ecc3 make fmt 2019-02-19 16:53:16 +08:00
Qiu Jian 6bb72482b9 fix: list managed resources and associate resources with uniform filters 2019-02-19 16:45:09 +08:00
邱剑 39795e8804 Merge pull request #1078 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-webconsole-wsproxy to release/2.6.0 
* commit '3b0379dabbd8ed25c6226cddad1bd3e456e2c8ee':
  webconsole: support websocket proxy
  webconsole: support websocket proxy
 2019-02-19 16:06:41 +08:00
邱剑 7af9d93ad4 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '39795e8804f06d9597c7fad45961e7b378569e46':
  webconsole: support websocket proxy
  webconsole: support websocket proxy
 2019-02-19 16:06:41 +08:00
邱剑 459507a41f Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '094d2eacc79b5496ed09651287e6038f384eb8db':
  add qcloud driver lb sync method && add comment
  bugfix & comment fix
  backend group sync bugfix
  make fmt
  add sync
  add sync
  getNetworkOfIPOnHost fix
  getNetworkOfIPOnHost fix
  add loadbalancer operation method && qcloud GetINetwork fix
  add loadbalancer operation method
  create init
  impement method fix
  impement method fix
  impement method fix
  qcloud loadbalance sync
 2019-02-19 15:35:12 +08:00
Zexi Li d41df56a82 webconsole: support websocket proxy 2019-02-19 15:32:07 +08:00
TangBin 8fdc9ec93d merge release/2.6.0 2019-02-19 09:26:56 +08:00