Qiu Jian 4e9eab8ee7 Merge branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20190313-2.7.0 ...

Conflicts:
	pkg/cloudcommon/db/taskman/tasks.go

2019-03-13 16:32:18 +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 branch 'release/2.6.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20190313-2.7.0

2019-03-13 16:32:18 +08:00

etcd

…

notifyclient

fix: specify notify user&groups domain as prefix

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

pending_delete

…

policy

treewide: s/HasSystemAdminPrivelege/HasSystemAdminPrivilege/g

2019-03-12 03:39:20 +00: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

…

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

…

doc.go

…

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