Wenkai Yin 414e8a8bcf Merge remote-tracking branch 'upstream/dev' into 170224_merge_config ... Conflicts: make/docker-compose.tpl src/ui/service/token/authutils.go		2017-02-24 13:52:19 +08:00
..
adminserver	using different secret to mark himself when communicates with other components	2017-02-23 18:24:32 +08:00
db	change code 20161019	2016-10-21 18:39:10 +08:00
jobservice	using different secret to mark himself when communicates with other components	2017-02-23 18:24:32 +08:00
nginx	deploy notary within Harbor	2017-02-20 19:31:28 +08:00
notary	deploy notary within Harbor	2017-02-20 19:31:28 +08:00
registry	move root.crt and private_key.pem to template	2016-11-09 18:21:28 +08:00
ui	using different secret to mark himself when communicates with other components	2017-02-23 18:24:32 +08:00