Qiu Jian 8815193f33 Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20190311 ...

Conflicts:
	pkg/compute/guestdrivers/aws.go
	pkg/compute/guestdrivers/huawei.go
	pkg/compute/guestdrivers/openstack.go
	pkg/compute/models/guests.go
	pkg/compute/models/hosts.go

2019-03-11 15:03:25 +08:00

..

baremetalagents.go

update models with db.Update interface

2019-02-22 12:06:13 +08:00

billingresource.go

…

cachedimages.go

Merge branch 'release/2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-sync-with-lock

2019-03-06 00:11:44 +08:00

capabilities.go

fix: zone capability storagetypes filter out baremetal hosts

2019-02-27 17:16:24 +08:00

cloudaccounts.go

fix: try to sync disconnected account for every 24 hours

2019-03-09 20:14:16 +08:00

cloudproviderregions.go

fix: to make it consistent, change cloudproviderregion auto_sync to

2019-03-07 22:35:30 +08:00

cloudproviders.go

Automatic merge from release/2.6.0 -> release/2.7.0

2019-03-07 16:57:59 +08:00

cloudregions.go

Automatic merge from release/2.6.0 -> release/2.7.0

2019-03-07 16:57:59 +08:00

cloudsync.go

Merge branch 'release/2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-sync-with-lock

2019-03-06 00:11:44 +08:00

disks.go

Merge remote-tracking branch 'origin/release/2.6.0' into confict/lzx-resolv-20190309

2019-03-09 14:02:36 +08:00

dnsrecords_test.go

…

dnsrecords.go

update models with db.Update interface

2019-02-22 12:06:13 +08:00

doc.go

…

dynamicschedtags.go

修正一些错误信息描述

2019-03-07 16:48:15 +08:00

elasticips.go

Automatic merge from release/2.6.0 -> release/2.7.0

2019-03-07 16:57:59 +08:00

external_projects.go

Merge branch 'release/2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-sync-with-lock

2019-03-06 00:11:44 +08:00

groupguests.go

…

groupjoints.go

1.

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

groupnetworks.go

1.

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

groups.go

1.

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

guest_actions.go

Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20190311

2019-03-11 15:03:25 +08:00

guestcdrom.go

update models with db.Update interface

2019-02-22 12:06:13 +08:00

guestdisks.go

Automatic merge from release/2.6.0 -> release/2.7.0

2019-03-01 12:26:42 +08:00

guestdrivers.go

Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20190311

2019-03-11 15:03:25 +08:00

guestjoints.go

…

guestnetworks.go

fix: recode host.getWiresOfId

2019-03-11 14:32:36 +08:00

guests.go

Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20190311

2019-03-11 15:03:25 +08:00

guestsecgroups.go

…

helper.go

…

host_recycle.go

Merge remote-tracking branch 'origin/release/2.6.0' into confict/lzx-resolv-20190309

2019-03-09 14:02:36 +08:00

hostdrivers.go

挂载后端校验

2019-03-04 18:42:14 +08:00

hostjoints.go

…

hostnetworks.go

…

hosts.go

Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20190311

2019-03-11 15:03:25 +08:00

hostschedtags.go

…

hoststorages.go

Merge branch 'release/2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-sync-with-lock

2019-03-06 00:11:44 +08:00

hostwires.go

fix: allow host attach to same wire with multiple interface

2019-03-07 22:37:17 +08:00

initdb.go

…

isolated_devices.go

update models with db.Update interface

2019-02-22 12:06:13 +08:00

keypairs.go

update models with db.Update interface

2019-02-22 12:06:13 +08:00

loadbalancer_common.go

…

loadbalanceracls.go

Merge branch 'release/2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-sync-with-lock

2019-03-06 00:11:44 +08:00

loadbalanceragents.go

update models with db.Update interface

2019-02-22 12:06:13 +08:00

loadbalancerbackendgroups.go

Merge branch 'release/2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-sync-with-lock

2019-03-06 00:11:44 +08:00

loadbalancerbackends.go

Merge branch 'release/2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-sync-with-lock

2019-03-06 00:11:44 +08:00

loadbalancercertificates.go

Merge branch 'release/2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-sync-with-lock

2019-03-06 00:11:44 +08:00

loadbalancerlistenerrules.go

Merge branch 'release/2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-sync-with-lock

2019-03-06 00:11:44 +08:00

loadbalancerlisteners.go

Automatic merge from release/2.6.0 -> release/2.7.0

2019-03-07 16:57:59 +08:00

loadbalancernetworks.go

update models with db.Update interface

2019-02-22 12:06:13 +08:00

loadbalancers.go

Merge branch 'release/2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-sync-with-lock

2019-03-06 00:11:44 +08:00

managedresource.go

make fmt

2019-02-19 16:53:16 +08:00

netinterfaces.go

Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20190311

2019-03-11 15:03:25 +08:00

networks.go

Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20190311

2019-03-11 15:03:25 +08:00

quotas.go

…

regiondrivers.go

…

reservedips.go

…

routetables.go

feature: allow auto sychrnoization of cloud account

2019-03-04 01:09:34 +08:00

schedpolicies.go

修正一些错误信息描述

2019-03-07 16:48:15 +08:00

schedtags.go

…

secgroupcache.go

conditional compilation: compile rbd on linux only

2019-03-06 01:06:36 +08:00

secgrouprules.go

Automatic merge from release/2.6.0 -> release/2.7.0

2019-03-07 16:57:59 +08:00

secgroups.go

Automatic merge from release/2.6.0 -> release/2.7.0

2019-03-07 16:57:59 +08:00

skus.go

Automatic merge from release/2.6.0 -> release/2.7.0

2019-03-07 16:22:25 +08:00

skustools.go

fix: resolve import loop between skus and models, merge skus into models

2019-03-04 02:31:39 +08:00

snapshots.go

Merge branch 'release/2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-sync-with-lock

2019-03-06 00:11:44 +08:00

specs.go

…

storagecachedimages.go

feature: allow auto sychrnoization of cloud account

2019-03-04 01:09:34 +08:00

storagecaches.go

Automatic merge from release/2.6.0 -> release/2.7.0

2019-03-07 16:57:59 +08:00

storagedrivers.go

host支持ceph

2019-03-04 18:41:45 +08:00

storages.go

Merge branch 'release/2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-sync-with-lock

2019-03-06 00:11:44 +08:00

syncutils.go

feature: allow auto sychrnoization of cloud account

2019-03-04 01:09:34 +08:00

syncworkers.go

feature: allow auto sychrnoization of cloud account

2019-03-04 01:09:34 +08:00

usage.go

…

vcenters.go

…

vpcs.go

Automatic merge from release/2.6.0 -> release/2.7.0

2019-03-07 16:57:59 +08:00

wires.go

Automatic merge from release/2.6.0 -> release/2.7.0

2019-03-07 16:57:59 +08:00

zones.go

improvements: autonomously adjust sync interval according to resources in region

2019-03-05 02:35:20 +08:00