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

..

lockman

update

2018-12-07 02:57:58 +08:00

quotas

glance重构 update 1

2018-12-26 22:52:13 +08:00

taskman

use separate worker for long running tasks, such as ImageConvertTask,

2018-12-27 16:19:24 +08:00

adminsharablevirtual.go

path move: github.com/yunionio -> yunion.io/x

2018-08-11 14:28:18 +08:00

db_dispatcher.go

Automatic merge from release/2.5.0 -> release/2.6.0

2019-02-13 18:26:58 +08:00

db_joint_dispatcher.go

1.

2019-01-27 00:30:43 +08:00

doc.go

add doc.go for each package

2018-08-11 14:41:38 +08:00

enabledstatusstandalone.go

region: fix host enable not clean sched cache

2018-12-04 18:52:17 +08:00

fetch.go

1.

2019-01-27 00:30:43 +08:00

initialization.go

cloudcommon pkg added.

2018-07-27 19:03:32 +08:00

interface.go

Automatic merge from release/2.5.0 -> release/2.6.0

2019-02-13 15:48:21 +08:00

jointbase.go

1.

2019-01-27 00:30:43 +08:00

keystonecache.go

minor fixes

2018-12-01 00:42:29 +08:00

list.go

region: make CustomizeFilterList logically

2018-10-27 14:29:08 +08:00

metadata.go

recode

2018-12-01 12:05:41 +08:00

modelbase.go

minor updates

2019-02-13 15:38:30 +08:00

models.go

cloudcommon: models: 注册modelMan时检查crud tag值

2018-12-03 13:44:46 +00:00

namevalidator.go

add network merge split

2019-01-05 22:37:21 +08:00

opslog.go

add action-show admin mode parameter

2019-02-12 16:29:26 +08:00

rbac.go

修正：1. attach权限校验总是false 2. 增加climc user

2019-01-09 20:49:26 +08:00

resourcebase.go

Automatic merge from release/2.5.0 -> release/2.6.0

2019-02-13 15:48:21 +08:00

sharablevirtual.go

feature:

2019-01-29 23:38:15 +08:00

standalone.go

Automatic merge from release/2.3.0 -> release/2.4.0

2019-02-15 12:11:55 +08:00

statusstandalone.go

修正：1. 包年包月资源池添加和减少操作需要做状态检查 2.

2019-01-11 21:13:40 +08:00

tenantcache.go

冲突解决

2019-01-22 16:29:08 +08:00

usercache.go

minor fixes

2018-12-01 00:42:29 +08:00

virtualjointbase.go

fix conflict

2018-12-01 16:18:11 +08:00

virtualresource.go

minor fixes

2019-02-09 06:23:23 +08:00