You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by da...@apache.org on 2016/12/06 05:21:30 UTC
[6/6] incubator-trafficcontrol git commit: Merge branch
'rat-and-apache-license' into apache-license-docker
Merge branch 'rat-and-apache-license' into apache-license-docker
Conflicts:
traffic_ops/app/db/create_tables.sql
traffic_ops/app/db/migrations/20150504100001_add_param_index.sql
traffic_ops/app/db/migrations/20150706084134_stats_summary_table.sql
traffic_ops/app/db/migrations/20150721000000_add_stat_date.sql
traffic_ops/app/db/migrations/20151020143912_unique_cdn_name.sql
traffic_ops/app/db/migrations/20151027152323_tr_request_headers.sql
traffic_ops/app/db/migrations/20151107000000_cdn_dnssec_enabled.sql
traffic_ops/app/db/migrations/20151207000000_unique_email.sql
traffic_ops/app/db/migrations/20160526140027_add_deploy_role.sql
traffic_ops/app/db/migrations/20160603084204_add_logs_enabled.sql
traffic_ops/app/db/migrations/20160613153313_add_guid.sql
traffic_ops/app/db/migrations/20160809092015_update_serverchecks.sql
traffic_ops/app/db/migrations/20160817171741_server_add_https_port.sql
traffic_ops/app/db/migrations/20160909141413_add_offline_reason.sql
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/f13fb5cb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/f13fb5cb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/f13fb5cb
Branch: refs/heads/psql-rebase
Commit: f13fb5cb8f892683f5b2be050634a40062ecc7f5
Parents: fc92ab9 12ab333
Author: Dan Kirkwood <da...@gmail.com>
Authored: Tue Dec 6 05:17:55 2016 +0000
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Tue Dec 6 05:17:55 2016 +0000
----------------------------------------------------------------------
.rat-excludes | 42 +++++++++++++++++++-
traffic_ops/app/db/create_tables.sql | 14 +++++++
traffic_ops/app/script/cdn | 15 +++++++
traffic_ops/app/t/api/1.2/parameter.t | 14 +++++++
.../app/t_integration/000init_database.t | 14 +++++++
traffic_ops/app/t_integration/configfiles.t | 14 +++++++
.../app/t_integration/configfiles_view.t | 14 +++++++
traffic_ops/app/t_integration/extensions.t | 14 +++++++
traffic_ops/app/t_integration/server.t | 14 +++++++
traffic_ops/app/t_integration/servercheck.t | 14 +++++++
traffic_ops/build/Vagrantfile | 14 +++++++
.../ats_config/Ats_Config_Dockerfile | 14 +++++++
.../experimental/postgrest/Postgrest_Dockerfile | 14 +++++++
traffic_ops/experimental/server/db/schema.sql | 15 +++++++
traffic_ops/experimental/server/notes.txt | 16 +++++++-
.../tools/db/migrations/initial_cleanup.sql | 15 +++++++
.../experimental/traffic_ops_auth/schema.sql | 15 +++++++
traffic_ops/experimental/ui/app/src/robots.txt | 14 +++++++
.../url-rewriter-nginx/Url_Rewriter_Dockerfile | 14 +++++++
traffic_ops/goto/run | 14 +++++++
traffic_portal/app/src/robots.txt | 14 +++++++
.../core/loc/AbstractServiceUpdaterTest.java | 15 +++++++
22 files changed, 341 insertions(+), 2 deletions(-)
----------------------------------------------------------------------