You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by de...@apache.org on 2017/01/20 21:39:42 UTC
[5/6] incubator-trafficcontrol git commit: Merge branch
'dcompose+master' of https://github.com/dangogh/incubator-trafficcontrol
Merge branch 'dcompose+master' of https://github.com/dangogh/incubator-trafficcontrol
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/d5013557
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/d5013557
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/d5013557
Branch: refs/heads/master
Commit: d501355716cfba9c7ee56f3de7c2f08b01bd35b5
Parents: 9d9afe1 422c152
Author: Dewayne Richardson <de...@apache.org>
Authored: Fri Jan 20 14:38:36 2017 -0700
Committer: Dewayne Richardson <de...@apache.org>
Committed: Fri Jan 20 14:38:36 2017 -0700
----------------------------------------------------------------------
.../app/db/pg-migration/Dockerfile-convert | 2 +-
.../app/db/pg-migration/Dockerfile-mysql | 2 +-
.../app/db/pg-migration/Dockerfile-postgres | 2 +-
traffic_ops/app/db/pg-migration/README.md | 22 ++----
traffic_ops/app/db/pg-migration/dataimport.yml | 6 +-
.../pg-migration/docker-compose-pgmigration.yml | 77 --------------------
.../app/db/pg-migration/docker-compose.yml | 7 +-
traffic_ops/app/db/pg-migration/mysql.env | 2 +
traffic_ops/app/db/pg-migration/pgmigration.yml | 56 ++++++++++++++
traffic_ops/app/db/pg-migration/postgres.env | 6 +-
.../app/db/pg-migration/postgres_host.yml | 6 +-
traffic_ops/app/db/pg-migration/runconvert.sh | 15 ----
traffic_ops/app/db/pg-migration/runpgloader.sh | 9 +--
13 files changed, 87 insertions(+), 125 deletions(-)
----------------------------------------------------------------------