You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@trafficcontrol.apache.org by mi...@apache.org on 2016/12/28 15:25:29 UTC

[4/5] incubator-trafficcontrol git commit: Merge branch 'postgres-mysql' of https://github.com/dangogh/incubator-trafficcontrol into postgres

Merge branch 'postgres-mysql' of https://github.com/dangogh/incubator-trafficcontrol into postgres


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

Branch: refs/heads/postgres
Commit: e41c0c0f863281e581353e5decc0998db8da2d7d
Parents: a5117e4 e07827e
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Wed Dec 28 08:23:39 2016 -0700
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Wed Dec 28 08:23:39 2016 -0700

----------------------------------------------------------------------
 traffic_ops/app/db/pg-migration/Dockerfile-mysql   |  2 +-
 traffic_ops/app/db/pg-migration/dataimport.env     | 17 +++++++++++++++++
 traffic_ops/app/db/pg-migration/dataimport.yml     |  6 ++----
 traffic_ops/app/db/pg-migration/docker-compose.yml |  4 ----
 traffic_ops/app/db/pg-migration/mysql.env          |  2 --
 traffic_ops/app/db/pg-migration/postgres.env       |  2 --
 traffic_ops/app/db/pg-migration/postgres_host.yml  |  6 ++----
 7 files changed, 22 insertions(+), 17 deletions(-)
----------------------------------------------------------------------