Merge branch 'master' into api-more

Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/223c615d
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/223c615d
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/223c615d

Branch: refs/heads/psql
Commit: 223c615d7d7a94b52af86af8d0dec4f92f3c00cb
Parents: 28f85a6 19ae65e
Author: Jeremy Mitchell <mitchell...@gmail.com>
Authored: Thu Oct 13 07:59:40 2016 -0600
Committer: Jeremy Mitchell <mitchell...@gmail.com>
Committed: Thu Oct 13 07:59:40 2016 -0600

----------------------------------------------------------------------
 build/docker-build.sh                           | 55 ++-----------
 .../docker/build/Dockerfile-traffic_monitor     | 42 ++++++++++
 .../docker/build/Dockerfile-traffic_ops         | 45 ++++++++++
 .../docker/build/Dockerfile-traffic_portal      | 40 +++++++++
 .../docker/build/Dockerfile-traffic_router      | 40 +++++++++
 .../docker/build/Dockerfile-traffic_stats       | 28 +++++++
 infrastructure/docker/build/README.md           |  9 ++
 infrastructure/docker/build/docker-compose.yml  | 73 ++++++++++++++++
 infrastructure/docker/build/run-build.sh        | 20 +++++
 traffic_monitor/build/Dockerfile                | 42 ----------
 traffic_ops/app/lib/UI/GenIso.pm                | 87 +++++++++-----------
 traffic_ops/build/Dockerfile                    | 43 ----------
 traffic_ops/install/bin/postinstall             | 18 ++--
 traffic_ops/install/data/perl/osversions.cfg    |  7 +-
 traffic_portal/build/Dockerfile                 | 38 ---------
 traffic_router/build/Dockerfile                 | 42 ----------
 traffic_stats/build/Dockerfile                  | 25 ------
 17 files changed, 356 insertions(+), 298 deletions(-)
----------------------------------------------------------------------


Reply via email to