Wenkai Yin 84b443e2b2 Merge remote-tracking branch 'upstream/master' into 170628_getpm ... Conflicts: src/ui/config/config.go src/ui/proxy/interceptor_test.go		2017-06-30 00:14:45 +08:00
..
common	Merge pull request #2657 from yixingjia/clairofflinedata	2017-06-28 18:01:34 +08:00
dev	create a global project manager	2017-06-30 00:08:45 +08:00
kubernetes	update kubernetes deployment	2017-01-16 12:06:35 +08:00
photon	add version support	2017-03-21 04:56:59 -07:00
checkenv.sh	update for fix #925	2016-10-24 16:51:42 +08:00
docker-compose.clair.yml	Merge pull request #2657 from yixingjia/clairofflinedata	2017-06-28 18:01:34 +08:00
docker-compose.notary.yml	set restart policy of notary to 'always'	2017-04-27 17:07:38 +08:00
docker-compose.tpl	create a global project manager	2017-06-30 00:08:45 +08:00
harbor.cfg	update documents (#2020)	2017-04-17 13:46:39 +08:00
install.sh	clair integration	2017-06-13 02:13:24 -07:00
prepare	Support include offline data on clair startup	2017-06-28 15:45:16 +08:00
pushimage.sh	change code 20161019	2016-10-21 18:39:10 +08:00