Wenkai Yin 0a873bc046 Merge remote-tracking branch 'upstream/master' into registry_api_util_update ... Conflicts: api/repository.go		2016-04-29 15:18:22 +08:00
..
token	token expires	2016-04-29 14:59:00 +08:00
utils	registry v2 API util	2016-04-27 17:59:43 +08:00
notification.go	Remove debug info	2016-04-26 21:00:29 +08:00