Commit Graph

155 Commits

Author SHA1 Message Date
周有松
5967461f11 Merge pull request #1266 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-security-group-sync to release/2.7.0
* commit '39f971ae29d42526512455014b342b4ce9e4d022':
  更新vendor
  更新参数名称
  支持过滤未关联某个安全组的虚机列表
  完成安全组同步代码重构
2019-03-26 15:49:30 +08:00
屈轩
39f971ae29 更新vendor 2019-03-26 15:47:48 +08:00
屈轩
845c159cac 更新参数名称 2019-03-25 22:27:59 +08:00
屈轩
c288c21ae2 支持过滤未关联某个安全组的虚机列表 2019-03-22 17:14:37 +08:00
Yousong Zhou
cef5ee859e vendor: add fsnotify lbagent 2019-03-18 03:34:58 +00:00
Yousong Zhou
098d62bdc5 treewide: 改进opslog记录update diff
action为ACT_UPDATE,仅当len(UpdateDiffs) > 0时才记录
2019-03-13 14:20:54 +00:00
屈轩
959306646b 添加rbd包 2019-03-04 18:41:46 +08:00
Qiu Jian
17d506da5f update vendor 2019-02-27 17:02:45 +08:00
Qiu Jian
10e6df934f update vendor 2019-02-26 00:33:37 +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
Zexi Li
6780acc5fd webconsole: support websocket proxy 2019-02-19 15:42:24 +08:00
wanyaoqi
ee69f890bd bug fix 2019-02-18 21:09:09 +08:00
TangBin
fa49e138f2 update vendor & bugfix 2019-02-16 17:55:42 +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
Qiu Jian
b70de93aa8 Merge branch 'release/2.5.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.6.0-20190214
Conflicts:
	Gopkg.lock
2019-02-13 21:49:51 +08:00
Qiu Jian
dd317fb83d update vendor 2019-02-13 21:15:45 +08:00
wanyaoqi
79f030acf0 dep add gopsutil/mem 2019-01-26 15:45:32 +08:00
wanyaoqi
4e77136adf remove jsonutils NewPair 2019-01-26 11:53:21 +08:00
wanyaoqi
609dc7b864 use procutils replace exec 2019-01-22 16:56:48 +08:00
wanyaoqi
0af9edab26 temp commit 2019-01-22 16:56:47 +08:00
Zexi Li
3baecbb91c * move utils path
* update vendor
2019-01-22 16:56:47 +08:00
Zexi Li
07863a7d6f baremetal prepare 2019-01-22 16:56:47 +08:00
Zexi Li
f64b7b8e5c - support relay address
- ssh util
- baremetal tasks
2019-01-22 16:56:47 +08:00
Zexi Li
703b094a60 baremetal init 2019-01-22 16:56:47 +08:00
wanyaoqi
cab32944b9 2018-12-04: init commit 2019-01-22 16:56:47 +08:00
wanyaoqi
2b4fac6a87 remove key index 2019-01-17 22:07:24 +08:00
Qiu Jian
305baf5d5f update vendor 2019-01-16 18:04:40 +08:00
屈轩
0ac4a7bff4 支持批量添加安全组规则 2019-01-04 12:30:53 +08:00
屈轩
dacf53b0cf 更新vendor 2019-01-02 17:39:49 +08:00
Qiu Jian
ea6890ea02 update vendor 2018-12-31 18:13:59 +08:00
Qiu Jian
8d60bc63c1 update vendor 2018-12-29 15:47:16 +08:00
Qiu Jian
dca4a1e478 update vendor & make compatible 2018-12-26 23:51:51 +08:00
Qiu Jian
bfa400cd53 update vendor 2018-12-26 23:31:54 +08:00
Qiu Jian
183e901cb4 update vendor
Conflicts:
	Gopkg.lock
2018-12-26 22:59:53 +08:00
Qiu Jian
2e587bd6ab glance重构 update 1
Conflicts:
	Gopkg.lock
	pkg/appsrv/appsrv.go
	pkg/cloudcommon/options.go
	pkg/compute/models/hosts.go
	pkg/compute/models/quotas.go
	pkg/compute/service/service.go
	pkg/mcclient/mcclient.go
2018-12-26 22:52:13 +08:00
Qiu Jian
c70201b177 temp commit
Conflicts:
	Gopkg.lock
	Gopkg.toml
	vendor/yunion.io/x/pkg/util/sysutils/storagetypes.go
	vendor/yunion.io/x/structarg/structarg.go
2018-12-26 22:44:03 +08:00
wanyaoqi
9976a7b0d4 make dep 2018-12-19 20:27:49 +08:00
Zexi Li
a45d41ef85 fix: region-dns compile failed 2018-12-19 16:41:56 +08:00
Qiu Jian
3e0c2ecd73 update vendor 2018-12-19 01:02:04 +08:00
Yousong Zhou
b5cb5e055e vendor: run "dep ensure -update yunion.io/x/structarg" 2018-12-13 10:44:54 +00:00
Yousong Zhou
d18c013832 vendor: run "dep ensure" 2018-12-13 10:44:46 +00:00
Yousong Zhou
6e1fc183cd Merge remote-tracking branch 'origin/release/2.3.0' into bugfix/yousong-vendor-240 2018-12-12 07:29:56 +00:00
Yousong Zhou
8f8c1a1f15 vendor: run "dep ensure -v -update yunion.io/x/jsonutils" 2018-12-12 06:37:21 +00:00
Yousong Zhou
8f10bed30a vendor: run "dep ensure" 2018-12-12 06:37:21 +00:00
邱剑
bdc5831b24 Automatic merge from release/2.2.0 -> release/2.3.0
* commit 'e1a423326dd93423fe76954784bf1bbbca523504':
  更新vendor
2018-12-10 13:30:33 +08:00
邱剑
1c1c6824df Automatic merge from release/2.3.0 -> release/2.4.0
* commit 'bdc5831b248af042a17560df78e2d3309b2ba00a':
  更新vendor
2018-12-10 13:30:33 +08:00
屈轩
88d44fee0c 更新vendor 2018-12-10 12:10:48 +08:00
Qiu Jian
f4e3201b3a update vendor 2018-12-10 11:16:34 +08:00
Qiu Jian
8e6f601768 update vendor 2018-12-10 01:11:44 +08:00