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

..

consts

Merge pull request #1018 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-notify-with-template to release/2.6.0

2019-02-11 23:04:17 +08:00

cronman

feature: allow auto sychrnoization of cloud account

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

db

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

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

etcd

add doc.go && make ParseOptions changes

2018-12-26 22:59:08 +08:00

notifyclient

fix: specify notify user&groups domain as prefix

2019-02-22 09:27:05 +08:00

pending_delete

add doc.go && make ParseOptions changes

2018-12-26 22:59:08 +08:00

policy

Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-image-p2p-distribution

2019-02-15 22:46:01 +08:00

service

Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-image-p2p-distribution

2019-02-15 22:46:01 +08:00

sshkeys

* move utils path

2019-01-22 16:56:47 +08:00

storagetypes

use procutils replace exec

2019-01-22 16:56:48 +08:00

types

feature: nic binding support

2019-03-11 04:43:12 +08:00

validators

fix: break dependencies of climc/mcclient on compute/models

2019-02-27 16:40:13 +08:00

workmanager

temp commit

2019-01-22 16:56:48 +08:00

app.go

Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-image-p2p-distribution

2019-02-15 22:46:01 +08:00

auth.go

fix: specify notify user&groups domain as prefix

2019-02-22 09:27:05 +08:00

database.go

cloudcommon: 在InitDB()中初始化DEBUG_SQLCHEMY

2018-12-23 15:26:50 +00:00

doc.go

add doc.go for each package

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

interface.go

fix: logger did not record start time of events

2019-02-16 13:47:18 +08:00

options.go

fix: specify notify user&groups domain as prefix

2019-02-22 09:27:05 +08:00