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
Files
f2e97ff272db0d86f8d0f46faf79a61e21971abe
cloudpods/pkg
T
History
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
..
appctx
huawei cloud sync
2019-01-01 16:21:37 +08:00
appsrv
fs driver fix
2019-02-14 10:23:10 +08:00
baremetal
mv: pkg/cloudcommon/dhcp -> pkg/util/dhcp
2019-02-12 16:09:53 +08:00
cloudcommon
Merge branch 'release/2.5.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.6.0-20190215
2019-02-15 19:47:56 +08:00
cloudir
update vendor & make compatible
2018-12-26 23:51:51 +08:00
cloudprovider
Merge branch 'release/2.5.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.6.0-20190213
2019-02-13 12:12:19 +08:00
cloutpost
update vendor & make compatible
2018-12-26 23:51:51 +08:00
compute
Merge branch 'release/2.5.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.6.0-20190215
2019-02-15 19:47:56 +08:00
dns
huawei cloud sync
2019-01-01 16:21:37 +08:00
hostimage
temp
2019-01-22 16:56:47 +08:00
hostman
Merge pull request #1047 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/host-server-v2 to release/2.6.0
2019-02-14 20:31:00 +08:00
httperrors
glance重构 update 1
2018-12-26 22:52:13 +08:00
image
Merge branch 'release/2.5.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.6.0-20190214
2019-02-13 21:49:51 +08:00
lbagent
lbagent: fix typo in log
2019-01-15 08:00:44 +00:00
logger
recode huawei client
2019-02-15 02:26:57 +08:00
mcclient
Merge pull request #1047 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/host-server-v2 to release/2.6.0
2019-02-14 20:31:00 +08:00
proxy
treewide: httperrors: 使用http.ResposneWriter时保留msg fmt
2018-11-28 07:39:55 +00:00
scheduler
Automatic merge from release/2.5.0 -> release/2.6.0
2019-02-13 15:48:21 +08:00
util
Merge branch 'release/2.5.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.6.0-20190215
2019-02-15 19:47:56 +08:00
webconsole
Merge branch 'release/2.5.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.6.0-20190215
2019-02-15 19:47:56 +08:00
yunionconf
merge huawei cloud
2019-01-02 11:03:10 +08:00