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/10/28 20:23:51 UTC
[2/2] incubator-trafficcontrol git commit: Merge branch
'limited/apache_release'
Merge branch 'limited/apache_release'
This closes #17
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/9c94dde1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/9c94dde1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/9c94dde1
Branch: refs/heads/master
Commit: 9c94dde11f45f97ad4589962bb630c8aa73a2190
Parents: 7fdcacf 30a1c1f
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Fri Oct 28 14:22:42 2016 -0600
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Fri Oct 28 14:22:42 2016 -0600
----------------------------------------------------------------------
CONTRIBUTING.md | 10 +++++-----
DISCLAIMER | 1 +
NOTICE | 13 ++++++++++---
docs/source/admin/quick_howto/regionalgeo.rst | 1 -
.../development/traffic_ops_api/v12/division.rst | 1 -
.../20160202000000_add_regional_geo_blocking.sql | 2 --
.../20160630000000_add_multisite_algrithom.sql | 1 -
.../migrations/20160630010009_add_secure_parameter.sql | 1 -
.../20160729000000_add_geolimit_redirect_url.sql | 1 -
traffic_ops/app/lib/API/Topology.pm | 1 -
.../traffic_router/core/loc/RegionalGeo.java | 1 -
.../traffic_router/core/loc/RegionalGeoDsvc.java | 1 -
.../traffic_router/core/loc/RegionalGeoResult.java | 1 -
.../traffic_router/core/loc/RegionalGeoRule.java | 1 -
.../traffic_router/core/loc/RegionalGeoUpdater.java | 1 -
.../traffic_router/core/loc/RegionalGeoRuleTest.java | 1 -
.../traffic_router/core/loc/RegionalGeoTest.java | 1 -
17 files changed, 16 insertions(+), 23 deletions(-)
----------------------------------------------------------------------