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
5,070 Commits 30 Branches 714 Tags
fcd4fd62e2a68f6945728dff50db9787055df419
Commit Graph
3276 Commits
Author SHA1 Message Date
wanyaoqi fcd4fd62e2 fix disk resize 2019-03-13 21:10:57 +08:00
邱剑 a4083c663f Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '4d931b20357e8e621645c461388de6a92a477902':
  make fmt
  fix: recode cloud-account-create commands, easier to use
 2019-03-13 20:14:49 +08:00
邱剑 4d931b2035 Merge pull request #1225 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-recode-cloud-account-create-options to release/2.7.0 
* commit '533a629dd43571fa0152cec5d3205e9cd6172a32':
  make fmt
  fix: recode cloud-account-create commands, easier to use
 2019-03-13 20:14:48 +08:00
邱剑 08c3bd8435 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '6828da3feede16654adff79e5166bad514f0b46d':
  fix: use agent manageruri instance of endpoint to visit agents
 2019-03-13 17:39:10 +08:00
邱剑 6828da3fee Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '4cf5c87a5a373f79f2604b512df9b5479f61b9d5':
  fix: use agent manageruri instance of endpoint to visit agents
 2019-03-13 17:39:09 +08:00
邱剑 4cf5c87a5a Merge pull request #1229 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-use-agent-manageruri-to-visit-agent to release/2.6.0 
* commit '64bb1b15db4e6ff7c5afb10059b6bdcbf7b54c10':
  fix: use agent manageruri instance of endpoint to visit agents
 2019-03-13 17:39:09 +08:00
周有松 541480349b Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '9f5283c11e73656f407bdc310b5411e024572419':
  fix: find image peer host with local storage only
  fix: filter cached images by storage status
  remove debug logs
  fix: usage port state not correct
  fix: 1. usage hide system servers 2. host undo convert shows wrong status
 2019-03-13 16:40:14 +08:00
Qiu Jian 4e9eab8ee7 Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20190313-2.7.0 
Conflicts:
	pkg/cloudcommon/db/taskman/tasks.go
 2019-03-13 16:32:18 +08:00
邱剑 9448fde22d Merge pull request #1222 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-msyd-bugfix-20190312 to release/2.6.0 
* commit '1ca00c14c6d0e3e9342f8e2a0a5586f6b2fc7a2c':
  fix: find image peer host with local storage only
  fix: filter cached images by storage status
  remove debug logs
  fix: usage port state not correct
  fix: 1. usage hide system servers 2. host undo convert shows wrong status
 2019-03-13 16:28:32 +08:00
邱剑 ab4923c589 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit 'aef848974c9ec2329ac72a910309b3a3b011cfae':
  fix: try to recover image properties(mindisk, format) at startup
 2019-03-13 16:27:25 +08:00
邱剑 dd5be61641 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '52ce7ddd10ba459c7411e42720d0b8d7b8049145':
  fix: cherry-pick hotfix/qj-recover-image-properties-at-startup
 2019-03-13 16:23:59 +08:00
邱剑 52ce7ddd10 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'dbab0d9c7c3fd67762c49a958186a4de160d6fc9':
  fix: cherry-pick hotfix/qj-recover-image-properties-at-startup
 2019-03-13 16:23:59 +08:00
Qiu Jian 64bb1b15db fix: use agent manageruri instance of endpoint to visit agents 2019-03-13 11:52:10 +08:00
邱剑 b9a5b2a431 Merge pull request #1221 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/host-server-v2 to release/2.8.0 
* commit '1d87a1ffc5ed7533e0745e32073e2e06a0378334':
  fix code, fix bug resize disk
  fix deploy with iso error
  support nfs storage
 2019-03-13 10:33:20 +08:00
Qiu Jian 7e606b64d3 fix: cherry-pick hotfix/qj-recover-image-properties-at-startup 2019-03-13 10:31:44 +08:00
Qiu Jian af100016be fix: try to recover image properties(mindisk, format) at startup 2019-03-13 10:12:12 +08:00
Qiu Jian 533a629dd4 make fmt 2019-03-13 01:47:28 +08:00
Qiu Jian 300f4e5163 fix: recode cloud-account-create commands, easier to use 2019-03-13 01:42:07 +08:00
Qiu Jian 1ca00c14c6 fix: find image peer host with local storage only 2019-03-12 21:48:40 +08:00
Qiu Jian cb9fea2286 fix: filter cached images by storage status 2019-03-12 18:24:12 +08:00
wanyaoqi 1d87a1ffc5 fix code, fix bug resize disk 2019-03-12 17:46:13 +08:00
周有松 3abb73a9b0 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'f0f6172156f0c693117ee6dc77c9c54bc4f942ba':
  lbagent: fix corpus versioning
  mcclient: options: ignore ID when converting to params
  lbagent: telegraf: add params influx_db_output_unsafe_ssl
  mcclient: lbagent: allow setting telegraf config template
  lb: 不记录来自lbagent的GET查询请求
  treewide: s/HasSystemAdminPrivelege/HasSystemAdminPrivilege/g
 2019-03-12 16:47:25 +08:00
周有松 1e14de7d4a Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '3abb73a9b047e3e40577bbd604627c984a3527ca':
  lbagent: fix corpus versioning
  mcclient: options: ignore ID when converting to params
  lbagent: telegraf: add params influx_db_output_unsafe_ssl
  mcclient: lbagent: allow setting telegraf config template
  lb: 不记录来自lbagent的GET查询请求
  treewide: s/HasSystemAdminPrivelege/HasSystemAdminPrivilege/g
 2019-03-12 16:47:25 +08:00
wanyaoqi 6cae515b8d fix deploy with iso error 2019-03-12 15:27:30 +08:00
Qiu Jian 8b460aa21f remove debug logs 2019-03-12 15:11:27 +08:00
Qiu Jian 4e85b1cd5a fix: usage port state not correct 2019-03-12 15:07:13 +08:00
Qiu Jian f7c61a9750 fix: 1. usage hide system servers 2. host undo convert shows wrong 
status
 2019-03-12 13:39:22 +08:00
wanyaoqi 95da368f36 support nfs storage 2019-03-12 12:46:55 +08:00
Yousong Zhou 4b4c86b883 lbagent: fix corpus versioning 2019-03-12 03:39:20 +00:00
Yousong Zhou fef63230ac mcclient: options: ignore ID when converting to params 2019-03-12 03:39:20 +00:00
Yousong Zhou 8016a27abf lbagent: telegraf: add params influx_db_output_unsafe_ssl 2019-03-12 03:39:20 +00:00
Yousong Zhou c6648ed0da mcclient: lbagent: allow setting telegraf config template 2019-03-12 03:39:20 +00:00
Yousong Zhou c6e4fff0d0 lb: 不记录来自lbagent的GET查询请求 
要求

 - _orig=lbagent
 - userCred.HasSystemAdminPrivilege()
 2019-03-12 03:39:20 +00:00
Yousong Zhou 07f98779ad treewide: s/HasSystemAdminPrivelege/HasSystemAdminPrivilege/g 2019-03-12 03:39:20 +00:00
周有松 076b805441 Merge pull request #1213 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/host-server-v2 to release/2.8.0 
* commit '3f8e3988da8a3fdd246a14a04e96ac8b826b1980':
  fix dhcp server
 2019-03-12 11:37:31 +08:00
邱剑 b930257c6d Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '36786805bdb7d20fc3548175cb75aba8ce4d8621':
  fix: image list show mindisk field
 2019-03-11 21:42:54 +08:00
邱剑 017447df21 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit 'b930257c6d3065b40f88c983d2cd57cbe5ebfefc':
  fix: image list show mindisk field
 2019-03-11 21:42:54 +08:00
Qiu Jian 61a0164f72 fix: image list show mindisk field 2019-03-11 21:41:23 +08:00
周有松 47c34b47e1 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '6c2c17769de66806ba13fd92770a0ed1867af712':
  fix: zone add filter by host
 2019-03-11 20:24:30 +08:00
周有松 6c2c17769d Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '734a9d47314cac9951090f858170c77771ebd6b2':
  fix: zone add filter by host
 2019-03-11 20:24:29 +08:00
周有松 734a9d4731 Merge pull request #1218 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-zone-add-host-filter to release/2.6.0 
* commit 'ce96f911919ca26bf6d91027f5335102c38ee8d9':
  fix: zone add filter by host
 2019-03-11 20:24:29 +08:00
Qiu Jian ce96f91191 fix: zone add filter by host 2019-03-11 20:22:47 +08:00
邱剑 99e2c939a5 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '8dacd50d0e7c995d7d4927f3c90a54046d1e52a8':
  修复2.5未自动合并2.4代码更改
 2019-03-11 18:28:42 +08:00
屈轩 aea7a72abe 修复2.5未自动合并2.4代码更改 2019-03-11 18:27:08 +08:00
邱剑 5d87f8dd76 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '2eaaa80fef6ad9cabf0c1a5a8071751519de18fc':
  跟随主机创建的磁盘默认都是auto delete
 2019-03-11 18:21:03 +08:00
屈轩 f981e2162e 冲突解决 2019-03-11 18:19:53 +08:00
邱剑 39af7f16b5 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit 'a291bd687813f494073e480f0c19cc63058c63fa':
  跟随主机创建的磁盘默认都是auto delete
 2019-03-11 18:14:17 +08:00
邱剑 a291bd6878 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '7ee3f025ae382b2ca0e7113e50ffffdf33693400':
  跟随主机创建的磁盘默认都是auto delete
 2019-03-11 18:14:17 +08:00
邱剑 3fcf5ca268 Automatic merge from release/2.7.0 -> release/2.8.0 
* commit '56c606f9c15d06ff2ae8a023d51ce6de50f31296':
  尽可能的同步openstack host信息
 2019-03-11 18:09:31 +08:00
邱剑 56c606f9c1 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '6ec6b2cf6c7db754713629f5d163ca4fd4b58dcd':
  尽可能的同步openstack host信息
 2019-03-11 18:09:30 +08:00