Commit Graph
1636 Commits
Author SHA1 Message Date
Qiu Jian 9f35039209 add service tag for actionlog 2019-02-18 01:13:40 +08:00
TangBin fa49e138f2 update vendor & bugfix 2019-02-16 17:55:42 +08:00
屈轩 b388874335 rebase 2.6.0 2019-02-16 17:44:40 +08:00
屈轩 f2c16bbc48 快照磁盘支持区分公有云私有云 2019-02-16 17:39:42 +08:00
屈轩 27ce557a57 openstack 同步flavor 2019-02-16 17:38:30 +08:00
屈轩 d85e2f8162 openstack创建 2019-02-16 17:37:33 +08:00
Zexi Li fb5e60c8fe util/ssh: add RawRun to get cmd output directly. 2019-02-16 17:01:02 +08:00
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
Qiu Jian 066d155a16 fix: logger did not record start time of events 2019-02-16 13:47:18 +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 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
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
Qiu Jian 44b409a4cd minor update 2019-02-15 14:20:47 +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
邱剑 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
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
TangBin 5fbc28f8aa server get disks fix 2019-02-13 18:07:18 +08:00
TangBin 632d1118db server delete etc fix 2019-02-13 17:04:06 +08:00
TangBin 7a447d31db server delete etc fix 2019-02-13 12:14:16 +08:00
Qiu Jian 0ad4c22879 Merge branch 'release/2.5.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.6.0-20190213
Conflicts:
	pkg/compute/tasks/cloud_provider_sync_info_task.go
2019-02-13 12:12:19 +08:00
Qiu Jian 6fccbfcd6e Merge branch 'release/2.4.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.5.0-20190213
Conflicts:
	pkg/compute/models/guests.go
	pkg/compute/service/service.go
	pkg/compute/tasks/cloud_provider_sync_info_task.go
2019-02-13 12:01:01 +08:00
tangbin 2d4166e841 backend group sync bugfix 2019-02-12 23:32:38 +08:00
TangBin b4e4cbad28 make fmt 2019-02-12 20:11:12 +08:00
TangBin 8bf555851d add sync 2019-02-12 20:02:05 +08:00
Zexi Li 79d5e74ea9 mv: pkg/cloudcommon/dhcp -> pkg/util/dhcp 2019-02-12 16:09:53 +08:00
Qiu Jian 173526ce06 fix: correct VM expiration date before clean expired prepaid VM 2019-02-12 01:02:57 +08:00
邱剑 808347aed1 Merge pull request #1018 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-notify-with-template to release/2.6.0
* commit '44faf10bfd78537d97c921867e3316a216f59147':
  update influxdb in a more graceful manner
  removel logs
  minor fixes
  增加:补充完整通知消息功能
2019-02-11 23:04:17 +08:00
Qiu Jian 44faf10bfd update influxdb in a more graceful manner 2019-02-11 23:01:44 +08:00
邱剑 cf1d09ad66 Merge pull request #1006 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/log-service-golang to release/2.6.0
* commit 'bb5aa4d3155c5dd6aca6ed06644c6e95bef8b742':
  minor updates
  update systemd unit description
  add logger rpm build scripts
  minor fixes
  logger service, half baked, needs more work
2019-02-11 20:59:08 +08:00
邱剑 9f09640238 Merge pull request #1021 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-baremetal-ipmi-password to release/2.6.0
* commit '16ad823d9e82e2f983d6e9d75a10c5377688b7d3':
  修正: baremetal prepare 时修改密码不生效
2019-02-11 20:22:07 +08:00
邱剑 f6e644648a Automatic merge from release/2.5.0 -> release/2.6.0
* commit 'f41fe12e990be35e40dd4c5e3aa47183ec63042a':
  缓存lb endpoint
  请求aliyun负载均衡使用对应的endpoint
2019-02-11 20:19:51 +08:00
Zexi Li 16ad823d9e 修正: baremetal prepare 时修改密码不生效 2019-02-11 20:00:07 +08:00
TangBin f287c8e091 add sync 2019-02-11 18:57:02 +08:00
屈轩 2f23eae351 缓存lb endpoint 2019-02-11 14:18:05 +08:00
屈轩 14bc2270f5 请求aliyun负载均衡使用对应的endpoint 2019-02-11 12:01:53 +08:00
Qiu Jian b215c199df minor fixes 2019-02-09 06:23:23 +08:00
TangBin b460044f3a add loadbalancer operation method && qcloud GetINetwork fix 2019-02-01 17:20:28 +08:00
TangBin 9010e9cbc1 add loadbalancer operation method 2019-02-01 16:10:18 +08:00