Wenkai Yin 385d76e6f2 Merge remote-tracking branch 'upstream/configuration' into 170214_encryption ...

Conflicts:
	src/common/utils/registry/auth/tokenauthorizer.go
	src/common/utils/test/adminserver.go
	src/jobservice/replication/transfer.go
	src/ui/api/config.go

2017-02-20 12:21:56 +08:00

..

adminserver

encrypt passwords and secret

2017-02-17 18:23:21 +08:00

common

Merge remote-tracking branch 'upstream/configuration' into 170214_encryption

2017-02-20 12:21:56 +08:00

jobservice

Merge remote-tracking branch 'upstream/configuration' into 170214_encryption

2017-02-20 12:21:56 +08:00

ui

Merge remote-tracking branch 'upstream/configuration' into 170214_encryption

2017-02-20 12:21:56 +08:00

vendor

Changes LDAP Library and other LDAP improvements (#1277)

2016-12-30 16:03:30 +08:00

favicon.ico

change code 20161019

2016-10-21 18:39:10 +08:00