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	configure harbor	2017-01-12 17:15:32 +08:00
jobservice	update version of photon OS to 1.0 in Docker files	2016-11-21 16:15:43 +08:00
log	remove rsyslogd.pid before start to allow container restarts	2016-12-01 15:31:14 +01:00
ui	remove openldap lib from Dockerfile and support build with offcial golang image(1.7.3)	2017-01-04 17:48:20 +08:00
Makefile	fix baseimage issue	2016-10-26 13:46:22 +08:00