Zexi Li 4a9477b9d7 resolve conflict

2019-03-22 15:59:42 +08:00

..

agent

fix: make virtual interface pointer more general

2019-03-19 20:18:48 +08:00

app

fix package dependence

2019-03-15 11:45:56 +08:00

cmdline

fix: ServerCreateInput keypair and secgroup wrong json tag

2019-03-22 09:20:39 +08:00

consts

merge const pkg from cloudcommon to compute

2019-03-17 11:21:17 +08:00

cronman

Merge remote-tracking branch 'origin/release/2.6.0' into bugfix/yousong-goimports-270

2019-03-13 13:33:51 +00:00

db

避免mysql _ 是特殊字符问题

2019-03-22 11:35:41 +08:00

etcd

treewide: group imports with goimports

2019-03-13 10:46:12 +00:00

notifyclient

fix: specify notify user&groups domain as prefix

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

options

fix package dependence

2019-03-15 11:45:56 +08:00

pending_delete

add doc.go && make ParseOptions changes

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

policy

添加普通用户查看metadata权限

2019-03-22 11:54:33 +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

types

resolve conflict

2019-03-22 15:59:42 +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

database.go

fix package dependence

2019-03-15 11:45:56 +08: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