Wenkai Yin 75f660fa77 Merge remote-tracking branch 'upstream/dev' into 161228_config ... Conflicts: make/common/templates/ui/env src/ui/auth/ldap/ldap.go src/ui/config/config.go		2017-01-12 17:41:14 +08:00
..
adminserver	Merge remote-tracking branch 'upstream/dev' into 161228_config	2017-01-12 17:41:14 +08:00
db	change code 20161019	2016-10-21 18:39:10 +08:00
jobservice	configure harbor	2017-01-12 17:15:32 +08:00
nginx	1.fix issue: deleting repo action will fall in deadlock between two Harbor if they are configured to sync to each other 2. Filter notification request in nginx	2016-12-09 18:10:20 +08:00
registry	move root.crt and private_key.pem to template	2016-11-09 18:21:28 +08:00
ui	configure harbor	2017-01-12 17:15:32 +08:00