Merge branch 'master' into deploy-agent
authorTom Clegg <tom@curoverse.com>
Thu, 16 Feb 2017 17:01:17 +0000 (12:01 -0500)
committerTom Clegg <tom@curoverse.com>
Thu, 16 Feb 2017 17:01:17 +0000 (12:01 -0500)
commitaaa536943dde5b3f1ec59c1bd18929b53dfea308
treef795b2d0f36f96cd91143b8aafe9de005bb551d2
parentbee301067b50d0cc00bbc1dc0a0b5c036d747a74
parent5624fec61db977d386ce03ca333241c74ca251b5
Merge branch 'master' into deploy-agent

Conflicts:
build/package-build-dockerfiles/centos7/Dockerfile
build/package-build-dockerfiles/debian8/Dockerfile
build/package-build-dockerfiles/ubuntu1204/Dockerfile
build/package-build-dockerfiles/ubuntu1404/Dockerfile
build/package-build-dockerfiles/centos7/Dockerfile
build/package-build-dockerfiles/debian8/Dockerfile
build/package-build-dockerfiles/ubuntu1204/Dockerfile
build/package-build-dockerfiles/ubuntu1404/Dockerfile
build/run-build-packages-one-target.sh
build/run-build-packages.sh
build/run-tests.sh