wemeya eb62beba31 modify merge conflicts

2016-06-02 17:57:39 +08:00

..

config

update https rewite url

2016-05-13 18:54:44 +08:00

db

fix issue in travis

2016-06-01 13:28:02 +08:00

kubernetes

reuse config files

2016-04-13 08:57:45 +08:00

log

Update Dockerfile

2016-05-17 11:24:02 +08:00

templates

modify merge conflicts

2016-06-02 17:57:39 +08:00

docker-compose.yml

integrate jobservice into docker-compose template

2016-05-27 16:21:32 +08:00

harbor.cfg

integrate jobservice into docker-compose template

2016-05-27 16:21:32 +08:00

prepare

integrate jobservice into docker-compose template

2016-05-27 16:21:32 +08:00