Wenkai Yin 14e71f0052 Merge branch 'master' into sync_image ...

Conflicts:
	.travis.yml
	models/accesslog.go
	models/project.go
	models/user.go

2016-06-13 18:14:41 +08:00

..

jobs

Merge remote-tracking branch 'upstream/job-service' into sync_image

2016-06-01 13:50:19 +08:00

base.go

filter policies by name and project ID

2016-06-13 16:49:46 +08:00

log.go

change code for review

2016-06-01 17:51:06 +08:00

member.go

update attributes of api

2016-06-01 15:17:05 +08:00

project.go

modify as travis CI required

2016-06-02 19:15:23 +08:00

replication_job.go

add comment

2016-05-30 15:39:51 +08:00

replication_policy.go

add modify policy

2016-06-13 17:32:22 +08:00

repository.go

modify merge conflicts

2016-06-02 17:57:39 +08:00

search.go

enable secret validation on UI and let job service use this secret to communicate with uI

2016-05-25 15:24:44 +08:00

statistic.go

enable secret validation on UI and let job service use this secret to communicate with uI

2016-05-25 15:24:44 +08:00

target.go

add modify policy

2016-06-13 17:32:22 +08:00

user.go

change code for travis ci

2016-06-06 23:47:27 +08:00

utils.go

try to stop replication when a policy is disabled

2016-06-02 18:17:00 +08:00