opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-31 02:38:07 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,104 Commits 30 Branches 712 Tags
58bb26c77f05de46e7f394aa047cf00a9c33149d
Commit Graph
1431 Commits
Author SHA1 Message Date
Qiu Jian 58bb26c77f Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20190321-2.7.0 
Conflicts:
	pkg/compute/guestdrivers/base.go
 2019-03-21 01:09:08 +08:00
邱剑 f986db4706 Merge pull request #1285 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-seperate-private-cloud-on-premise to release/2.7.0 
* commit '99a10db949d80155dba0b830498f2bcef2774e37':
  fix: separate private cloud & on-premise
 2019-03-20 14:40:27 +08:00
Qiu Jian a93968e0d2 fix: 1. vmware detch disk logic error 2. host add storage commit_rate 3. 
host enable netif failed if a fake ipaddr is given
 2019-03-20 14:37:37 +08:00
Qiu Jian 99a10db949 fix: separate private cloud & on-premise 2019-03-19 22:14:01 +08:00
Qiu Jian 29245c931c fix: turn delete prepaid vm to postpaid, so as to allow deleting the vm 2019-03-19 20:00:22 +08:00
邱剑 3f1dfac8f1 Merge pull request #1268 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-cloud-provider-missing-sync-time to release/2.7.0 
* commit 'ca39f480580030b8f25f686a08de8a0c23d1e90d':
  fix: more accurate sync_status update time
  fix: cloud provider sync time is not set in auto-sync cycles
 2019-03-19 08:20:55 +08:00
Qiu Jian ca39f48058 fix: more accurate sync_status update time 2019-03-18 22:16:20 +08:00
邱剑 2a0600e7e0 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'f71e16712851064d93f38f142c59ca7f2acac160':
  兼容disk json参数
 2019-03-18 20:55:12 +08:00
邱剑 f71e167128 Merge pull request #1256 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-guest-create-disk-json-params to release/2.6.0 
* commit 'ec764d2d1d8ebf1686eeff9e94469dfc1b317485':
  兼容disk json参数
 2019-03-18 20:55:11 +08:00
邱剑 51f62c973b Merge pull request #1264 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-skus-query-fix to release/2.7.0 
* commit '6c040d4b76e21b5ffa6a53b1ba102ae2a4e730f2':
  skus group by GB
 2019-03-18 18:04:41 +08:00
邱剑 53feaef241 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'f6fedf390f43e2ea1c0ef55b67f00bc7bdd5dfad':
  fix: 1. remote file will retry glance if peer url is not available 2. ssh authorized keys ends with \n
 2019-03-18 09:04:53 +08:00
邱剑 f6fedf390f Merge pull request #1269 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-host-remote-file-support-retry-glance to release/2.6.0 
* commit 'deafebd3e0ce4b2fd92d35739a5816aba5817871':
  fix: 1. remote file will retry glance if peer url is not available 2. ssh authorized keys ends with \n
 2019-03-18 09:04:52 +08:00
Yousong Zhou 4f7a4177ac Merge remote-tracking branch 'origin/release/2.6.0' into feature/yousong-lbagent-managed 2019-03-17 02:35:09 +00:00
邱剑 019df55b82 Merge pull request #1258 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:feature/yousong-lbagent-managed to release/2.6.0 
* commit '1b879d1b2409a6b1b56d67fa23b4ef53617383a4':
  lbagent: try using unicast vrrp
  lbagent: report ip, ha_state, version
  lbagent: always reload on startup
  lbagent: making agent params with reflect
  netutils2: add MyIP() for finding default source ip
 2019-03-17 00:04:37 +08:00
Qiu Jian deafebd3e0 fix: 1. remote file will retry glance if peer url is not available 2. 
ssh authorized keys ends with \n
 2019-03-16 21:34:07 +08:00
Qiu Jian 6fa0e254ef fix: cloud provider sync time is not set in auto-sync cycles 2019-03-16 21:23:43 +08:00
邱剑 b48dc22b3d Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '8be49a8d69072e8afe18fd5cb8d8536345257e10':
  guest do not sync status on guest delete
 2019-03-15 20:21:05 +08:00
Yousong Zhou 1b879d1b24 lbagent: try using unicast vrrp 2019-03-15 12:11:22 +00:00
Yousong Zhou 33f568717b lbagent: report ip, ha_state, version 2019-03-15 12:11:22 +00:00
TangBin 6c040d4b76 skus group by GB 2019-03-15 16:10:37 +08:00
wanyaoqi 389d64d92b guest do not sync status on guest delete 2019-03-15 15:49:53 +08:00
Qiu Jian 8ee64bf416 Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-recode-cloud-account-create-options 
Conflicts:
	pkg/compute/options/options.go
 2019-03-15 09:48:55 +08:00
邱剑 d37160a90f Merge pull request #1246 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/fix-capabilities to release/2.6.0 
* commit 'f3554fe30f3b1fe30a1ea832190f7d2d4747a384':
  make capabilities optional
 2019-03-14 23:12:41 +08:00
屈轩 ec764d2d1d 兼容disk json参数 2019-03-14 20:26:58 +08:00
Qiu Jian bc50179bbe Merge branch 'hotfix/qj-resolve-conflict-20190314-2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-recode-cloud-account-create-options 2019-03-14 16:21:39 +08:00
Qiu Jian f935155b5b fix: issues due to move of skustools to models at 2.7.0 2019-03-14 16:06:33 +08:00
周有松 5ac89a7912 Merge pull request #1250 in YUNIONIO/onecloud from release/2.6.0 to release/2.7.0 
* commit '3c8d6a7337633fcc3afa45e664d7f627e37dabb6':
  add skus util function test
  soldout skus fix & add more comment
 2019-03-14 15:49:46 +08:00
Yousong Zhou 4e3925be5b Merge remote-tracking branch 'origin/release/2.6.0' into bugfix/yousong-update-diffs-270 2019-03-14 07:39:01 +00:00
邱剑 3c8d6a7337 Merge pull request #1248 in YUNIONIO/onecloud from ~TANGBIN/onecloud:bugfix/tb-conflicts-fix-release2.6.0-314 to release/2.6.0 
* commit '9464f71ed2a609398c71897e9649108bdaeda382':
  add skus util function test
  soldout skus fix & add more comment
 2019-03-14 15:38:20 +08:00
TangBin 9464f71ed2 fix conflicts 2019-03-14 12:33:53 +08:00
Qiu Jian 60ea022492 minor fixes 2019-03-14 12:19:03 +08:00
wanyaoqi f3554fe30f make capabilities optional 2019-03-14 12:13:37 +08:00
Qiu Jian 6e8e415235 Merge branch 'release/2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-recode-cloud-account-create-options 2019-03-14 12:11:54 +08:00
Qiu Jian 62a8e1eb7f not allow to delete cloud-account and provider when auto sync enabled 2019-03-14 11:08:56 +08:00
TangBin 173098a998 fix conflicts 2019-03-14 10:53:52 +08:00
Qiu Jian e74f31b7c0 fix: cleanup project sync codes 2019-03-14 09:46:29 +08:00
Yousong Zhou 098d62bdc5 treewide: 改进opslog记录update diff 
action为ACT_UPDATE，仅当len(UpdateDiffs) > 0时才记录
 2019-03-13 14:20:54 +00:00
Yousong Zhou 4c82dae39b Merge remote-tracking branch 'origin/release/2.6.0' into bugfix/yousong-goimports-270 2019-03-13 13:33:51 +00:00
邱剑 223c9f6461 Merge pull request #1224 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-goimports to release/2.6.0 
* commit '8fe4f2ec98110dece5412f7980a0085725b7e993':
  treewide: group imports with goimports
 2019-03-13 21:01:20 +08:00
邱剑 6a5923693f Automatic merge from release/2.6.0 -> release/2.7.0 
* commit 'df6bc80c892d9329cab4d21a009aee890a43f16a':
  fix disk resize
 2019-03-13 20:56:16 +08:00
邱剑 df6bc80c89 Merge pull request #1228 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/fix-disk-resize-backport-from-2.8 to release/2.6.0 
* commit '2d863896854beee27168f5dd2f00aafb9dbe1131':
  fix disk resize
 2019-03-13 20:56:16 +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
Yousong Zhou 8fe4f2ec98 treewide: group imports with goimports 
./goimports -w -local yunion.io/x/onecloud/ -corp yunion.io/x/ $GOPATH/src/yunion.io/x/onecloud/{cmd,pkg}
 2019-03-13 10:46:12 +00: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
邱剑 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
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
TangBin a32ddd4364 add skus util function test 2019-03-13 15:33:11 +08:00
TangBin d9baf4c462 soldout skus fix & add more comment 2019-03-13 12:09:59 +08:00
Qiu Jian 64bb1b15db fix: use agent manageruri instance of endpoint to visit agents 2019-03-13 11:52:10 +08:00