Commit Graph
67 Commits
Author SHA1 Message Date
屈轩 959306646b 添加rbd包 2019-03-04 18:41:46 +08:00
Zexi Li 6780acc5fd webconsole: support websocket proxy 2019-02-19 15:42:24 +08:00
wanyaoqi 79f030acf0 dep add gopsutil/mem 2019-01-26 15:45:32 +08:00
Zexi Li 63abe548bc * move utils path
* update vendor
2019-01-07 17:07:03 +08:00
Zexi Li 78fb5a9cdc baremetal prepare 2019-01-07 17:06:29 +08:00
Zexi Li 9d0086172a baremetal init 2019-01-07 17:05:12 +08:00
wanyaoqi e25730acce 2018-12-04: init commit 2019-01-07 17:03:31 +08:00
Qiu Jian bfa400cd53 update vendor 2018-12-26 23:31:54 +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
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
Qiu Jian 08386d3958 update vendor 2018-12-07 17:57:40 +08:00
屈轩 2608e8e6b9 初始化model 2018-12-03 21:12:44 +08:00
Qiu Jian c3026bbee1 update vendor 2018-11-25 23:14:40 +08:00
TangBin b7af004286 fix confilct 2018-11-19 15:08:04 +08:00
TangBin bc1fae8ebb rebuild root disk 2018-11-17 10:25:25 +08:00
TangBin 68028cb781 fix region-dns build error 2018-11-12 20:09:01 +08:00
TangBin 74e3f9a699 update vendor 2018-11-10 20:00:36 +08:00
屈轩 aab792ffa8 添加部分aliyun操作 2018-11-08 15:37:30 +08:00
TangBin 1f341232de update vendor and fix conficlt 2018-11-07 17:47:00 +08:00
屈轩 9833767fb2 支持腾讯云资源导入 2018-11-03 17:32:54 +08:00
屈轩 fe0a36919c 解决冲突 2018-11-02 13:56:54 +08:00
wanyaoqi 8ce76004d5 make dep 2018-11-01 21:25:40 +08:00
TangBin 66a899bc55 add vmimport init method 2018-10-22 19:44:43 +08:00
TangBin e4cade7db1 add role create method 2018-10-22 18:55:37 +08:00
Qiu Jian 2063b0d385 Update vendor 2018-10-13 20:35:21 +08:00
TangBin a1bbecdb24 add provider & update dep 2018-10-11 18:43:06 +08:00
TangBin 4ad0acf8be update dep 2018-10-10 14:44:31 +08:00
Zhang Dongliang 2202f27fc8 dep ensure,解决依赖问题 2018-09-29 14:56:00 +08:00
李泽玺 84027cbe3f Automatic merge from release/2.1.0 -> release/2.2.0
* commit '8b83cef27239403dd23d76c6ae49c35753c2904b':
  fix: climc prompt for macos
2018-09-29 12:32:19 +08:00
Zexi Li 6da9ea4a77 fix: climc prompt for macos 2018-09-29 12:31:13 +08:00
Zhang Dongliang 1bf9478693 autoupdate support for onecloud 2018-09-28 11:24:51 +08:00
屈轩 03a80615cc resolve conflict 2018-09-19 22:02:01 +08:00
屈轩 93be70e9ac Merge branch 'release/2.2.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-azure 2018-09-18 21:19:37 +08:00
Qiu Jian 03af1fc8a2 支持将list的结果导出为excel文件 2018-09-17 22:36:08 +08:00
屈轩 c09a63442f Merge branch 'release/2.2.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-azure 2018-09-15 14:02:21 +08:00
屈轩 20381d0775 resolve conflict 2018-09-12 15:28:34 +08:00
屈轩 224193248f resolve conflict 2018-09-11 16:39:49 +08:00
Qiu Jian ce51f90f51 Update vendor 20180909 2018-09-09 19:36:34 +08:00
屈轩 e744b8d6a9 Merge branch 'release/2.2.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-azure 2018-09-05 14:55:08 +08:00
Zexi Li f027ceeff7 vendor added 2018-09-04 19:12:11 +08:00
屈轩 9dae032f75 image cache 2018-09-03 21:53:02 +08:00
屈轩 4b53845421 resolve conflict 2018-08-29 21:22:08 +08:00
邱剑 1a02439127 Automatic merge from release/2.0.0 -> release/2.1.0
* commit '7c19d8e062abb99dd04e260ffc258bea8effd032':
  vendor: add github.com/hako/durafmt
  climc: k8s-deployment-create support network
  climc: k8s cluster import and addnodes
  climc: k8s resource table print
  climc: k8s-deployment-create support network
  climc: k8s cluster import and addnodes
  climc: k8s resource table print
2018-08-29 16:43:49 +08:00
Zexi Li 39bba47f71 vendor: add github.com/hako/durafmt 2018-08-29 14:47:57 +08:00
屈轩 a75dc1b729 Merge branch 'release/2.1.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-azure 2018-08-29 10:38:55 +08:00
屈轩 3625987932 添加Azure安全组同步 2018-08-25 18:50:12 +08:00
屈轩 d264daa185 添加vendor更新 2018-08-24 16:39:35 +08:00
Zexi Li 5e8b7b3ce3 fix auto-merge conflict 2018-08-21 20:49:42 +08:00