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

Conflicts:
	pkg/appsrv/appsrv.go
	pkg/cloudcommon/policy/defaults.go
	pkg/util/sysutils/sysutils.go

2019-02-15 22:46:01 +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

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

db

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

etcd

add doc.go && make ParseOptions changes

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

ethernet

add bsd raw socket code

2019-01-26 16:12:01 +08:00

notifyclient

removel logs

2019-02-11 08:50:36 +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

types struct 符合命名规范

2019-01-28 10:06:56 +08:00

validators

validators: 添加ApplyModelFilters()

2018-12-12 08:50:57 +00: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

treewide: 重新组织cloudcommon options

2018-12-23 15:31:11 +00: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

options.go

Merge pull request #1049 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-webconsole-login to release/2.5.0

2019-02-15 12:12:19 +08:00