Steven Zou 0f16913635 rebase: resolve the code confilcts with master ...

Signed-off-by: Steven Zou <szou@vmware.com>

2019-10-17 17:42:41 +08:00

..

kubernetes

Remove unused configure item cfg_expiration (#7744)

2019-05-09 22:07:18 +08:00

migrations/postgresql

do changes to let the vul policy check compatiable with new framework

2019-10-16 23:15:26 +08:00

photon

build(clair): internal clair adapter when install with clair

2019-10-17 12:00:51 +08:00

checkenv.sh

Extract shared func for checkenv and install scripts

2019-10-10 15:07:09 +08:00

common.sh

Extract shared func for checkenv and install scripts

2019-10-10 15:07:09 +08:00

harbor.yml

fix(build): max idle and open conn settings for external db (#8854)

2019-08-29 15:04:10 +08:00

install.sh

Extract shared func for checkenv and install scripts

2019-10-10 15:07:09 +08:00

prepare

Merge pull request #8259 from amritanshu-pandey/feature/fix-typos

2019-08-19 15:09:24 +08:00

pushimage.sh

use $REGISTRY instead of $4 (#3103)

2017-08-22 18:24:34 +08:00