Commit Graph
6987 Commits
Author SHA1 Message Date
TangBin 4669903d8a Merge branch 'release/2.6.0' into bugfix/tb-huawei-stage-2.2-fix 2019-02-16 16:00:48 +08:00
TangBin a0f3423519 bugfix 2019-02-16 15:59:47 +08:00
Qiu Jian 8554d13c4a make fmt 2019-02-16 15:17:31 +08:00
Zexi Li 88b11a373b host: deploy admin ssh public key when register 2019-02-16 15:05:04 +08:00
万垚奇 52d51ed44b Automatic merge from release/2.6.0 -> release/2.7.0
* commit '8b24b34da1d19d09628132c786d83a82358bd923':
  minor changes
  fix: converted host configuration always use http as keystone protocol
2019-02-16 14:10:32 +08:00
Qiu Jian 3319bab2e1 Merge branch 'release/2.5.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.6.0-20190216
Conflicts:
	pkg/cloudcommon/db/opslog.go
2019-02-16 14:08:56 +08:00
Qiu Jian 066d155a16 fix: logger did not record start time of events 2019-02-16 13:47:18 +08:00
李泽玺 315567a3d9 Automatic merge from release/2.6.0 -> release/2.7.0
* commit 'e20535203617635e2f1344206bb726d6e92f673f':
  fix: send system notification to specific users or groups
2019-02-16 10:10:28 +08:00
Qiu Jian a72ae86082 fix: send system notification to specific users or groups 2019-02-16 01:46:39 +08:00
Qiu Jian a7faa9b318 minor changes 2019-02-16 01:25:16 +08:00
Qiu Jian 6de65ba419 fix: converted host configuration always use http as keystone protocol 2019-02-15 23:05:30 +08:00
邱剑 806a31d3e7 Merge pull request #1059 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/server-disk-list-add-medium-type to release/2.7.0
* commit 'e69015933d538fd2bf5138b892c5ae6e86c7587c':
  server-disk-list add medium type
2019-02-15 22:48:31 +08:00
Qiu Jian 4c6f196ec5 Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-image-p2p-distribution
Conflicts:
	pkg/appsrv/appsrv.go
	pkg/cloudcommon/policy/defaults.go
	pkg/util/sysutils/sysutils.go
2019-02-15 22:46:01 +08:00
李泽玺 cf3631983c Merge pull request #1058 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/host-server-v2 to release/2.6.0
* commit 'c886b09982d97c24709f384ead1b69a20f38fae0':
  fix remotefix close body bug
  move ethernet from cloudcommon to utils
  rootfs drivers: linux, macOS, Android, ESXi etc.
2019-02-15 21:19:51 +08:00
wanyaoqi e69015933d server-disk-list add medium type 2019-02-15 21:02:06 +08:00
wanyaoqi c886b09982 fix remotefix close body bug 2019-02-15 20:42:37 +08:00
wanyaoqi 853d9dbb5e move ethernet from cloudcommon to utils 2019-02-15 20:29:30 +08:00
wanyaoqi 27abd40bd7 rootfs drivers: linux, macOS, Android, ESXi etc. 2019-02-15 20:16:23 +08:00
邱剑 713fa7d7bb Automatic merge from release/2.4.0 -> release/2.5.0
* commit 'c44a7f8407cca4db2a97caa93908966a1565d7f4':
  全量同步后立即更新cloudaccount状态
2019-02-15 19:58:38 +08:00
邱剑 54e297ca00 Automatic merge from release/2.5.0 -> release/2.6.0
* commit '713fa7d7bb8e0cef0acaa16090d1b76d8f2a8c43':
  全量同步后立即更新cloudaccount状态
2019-02-15 19:58:38 +08:00
邱剑 c44a7f8407 Automatic merge from release/2.3.0 -> release/2.4.0
* commit '6528992b5be15b5cfba35dce770c272f98d4c452':
  全量同步后立即更新cloudaccount状态
2019-02-15 19:58:37 +08:00
邱剑 6528992b5b Merge pull request #1050 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-cloudaccount-sync-status to release/2.3.0
* commit '4fa4083e8dc0b55926e1c430bf853f983a116ad8':
  全量同步后立即更新cloudaccount状态
2019-02-15 19:58:37 +08:00
Qiu Jian f2e97ff272 Merge branch 'release/2.5.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.6.0-20190215
Conflicts:
	pkg/compute/guestdrivers/esxi.go
	pkg/compute/guestdrivers/openstack.go
2019-02-15 19:47:56 +08:00
邱剑 38d22259a7 Merge pull request #1053 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-huawei-recode to release/2.6.0
* commit '44b409a4cd9e70fa44cae86ceff659b4344994d4':
  minor update
  minor fixes
  recode huawei client
2019-02-15 18:54:05 +08:00
屈轩 4fa4083e8d 全量同步后立即更新cloudaccount状态 2019-02-15 16:03:24 +08:00
Qiu Jian 44b409a4cd minor update 2019-02-15 14:20:47 +08:00
Qiu Jian dbf24af405 implement sysdisk interface for openstack and huawei driver 2019-02-15 13:29:50 +08:00
邱剑 a747ad2c20 Merge pull request #1049 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-webconsole-login to release/2.5.0
* commit 'c9756aa6f0da02ac8e211dbf7bb88606cadb1aa3':
  添加参数,允许不直接登录虚拟机
2019-02-15 12:12:19 +08:00
邱剑 256b6e9841 Automatic merge from release/2.4.0 -> release/2.5.0
* commit '220df08a486d2a5e725c64e3f7cc42437c7ca41f':
  log日志记录external_id
2019-02-15 12:11:56 +08:00
邱剑 220df08a48 Automatic merge from release/2.3.0 -> release/2.4.0
* commit 'ab97a01b9ccaaa1b2af46fd9bc744e256ccea69e':
  log日志记录external_id
2019-02-15 12:11:55 +08:00
邱剑 c871a31882 Automatic merge from release/2.4.0 -> release/2.5.0
* commit 'a5731134dc8e8b62afbd1f7504f148291ab039ef':
  update: customize system disk size and backend for each hypervisor
2019-02-15 12:09:44 +08:00
屈轩 2d7a17464c log日志记录external_id 2019-02-15 11:56:12 +08:00
屈轩 c9756aa6f0 添加参数,允许不直接登录虚拟机 2019-02-15 10:46:57 +08:00
Qiu Jian 186b32e3cf minor fixes 2019-02-15 09:47:58 +08:00
Qiu Jian 359c451e8e recode huawei client 2019-02-15 02:26:57 +08:00
万垚奇 abfe3f4c3c Merge pull request #1047 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/host-server-v2 to release/2.6.0
* commit '3eb7c2900ec29e5b8fa2d1f1def6d469ce003de0':
  fix code
  fs driver fix
2019-02-14 20:31:00 +08:00
wanyaoqi 3eb7c2900e fix code 2019-02-14 20:29:24 +08:00
Qiu Jian e59157e3b3 fix: baremetal host driver interface change break build 2019-02-14 18:42:10 +08:00
邱剑 bf1720118e Automatic merge from release/2.5.0 -> release/2.6.0
* commit '273405782c738858c8836267119e77463e345612':
  cloudcommon using structarg.ParseArgs2 to parse arguments
2019-02-14 17:43:06 +08:00
Qiu Jian 543c87fb84 cloudcommon using structarg.ParseArgs2 to parse arguments 2019-02-14 17:31:27 +08:00
邱剑 89c09291fd Merge pull request #1046 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-cloud-region-cities to release/2.6.0
* commit '8656db336b578b55840028e97e20421010cca423':
  minor fixes
  add cloud-region-providers climc command
  feature: get list of cities where cloud region resides and filter cloud regions by city
2019-02-14 17:04:27 +08:00
Qiu Jian 8656db336b minor fixes 2019-02-14 17:00:00 +08:00
Qiu Jian 16bb703d98 add cloud-region-providers climc command 2019-02-14 16:28:16 +08:00
TangBin 37c79c9a23 替换不必要的重复func 2019-02-14 14:43:59 +08:00
TangBin b12f0252eb remove useless todo 2019-02-14 12:31:43 +08:00
TangBin d927f2dfc4 rebuild root bugfix 2019-02-14 12:28:36 +08:00
wanyaoqi b210add54d fs driver fix 2019-02-14 10:23:10 +08:00
Qiu Jian e1b7854993 feature: get list of cities where cloud region resides and filter cloud
regions by city
2019-02-14 01:40:26 +08:00
Qiu Jian 97cfcbff6e Fix: do not automatically deallocate EIP that was created when
associated, should be deallocate explicitly by user
2019-02-13 23:47:51 +08:00
Qiu Jian 5ceaaf716e update: customize system disk size and backend for each hypervisor 2019-02-13 23:39:36 +08:00