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/11/07 22:23:45 UTC
[24/26] incubator-trafficcontrol git commit: merge master
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/.rat-excludes
----------------------------------------------------------------------
diff --git a/.rat-excludes b/.rat-excludes
new file mode 100644
index 0000000..1d2c80f
--- /dev/null
+++ b/.rat-excludes
@@ -0,0 +1 @@
+./docs/*
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/CONTRIBUTING.md
----------------------------------------------------------------------
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6e6addf..8f5f66b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,15 +1,15 @@
How To Contribute
=================
-We love pull requests! We simply don't have the time or resources to add every feature and support every platform. If you have improvements for Traffic Control, we're more than happy to merge them in.
+We love pull requests! We simply don't have the time or resources to add every feature and support every platform. If you have improvements (enhancements or bug fixes) for Traffic Control, start by creating an [issue](https://issues.apache.org/jira/browse/TC) and discussing it with us first on the [users@trafficcontrol.incubator.apache.org](mailto:users@trafficcontrol.incubator.apache.org) mailing list. We might already be working on it, or there might be an existing way to do it.
-We have a few [guidelines](https://github.com/Comcast/traffic_control/blob/master/CONTRIBUTING.md#guidelines) to help maintain code quality and ensure the pull request process goes smoothly.
+Once your issue has been approved and you're ready to start slinging code, we have a few [guidelines](https://github.com/apache/incubator-trafficcontrol/blob/master/CONTRIBUTING.md#guidelines) to help maintain code quality and ensure the pull request process goes smoothly.
-Remember, it doesn't have to be perfect. If you want to help, hack it together and submit a [pull request](https://help.github.com/articles/using-pull-requests/). We'll work with you to make sure it fits properly into the project.
+Remember, your code doesn't have to be perfect. Hack it together and submit a [pull request](https://help.github.com/articles/using-pull-requests/). We'll work with you to make sure it fits properly into the project.
-Contributor License Agreement
+CONTRIBUTORS.md
-----------------------------
-First things first, we need you to sign the [Contributor License Agreement (CLA)](http://traffic-control-cdn.net/ComcastContributorLicenseAgreement_03-07-14.pdf) before we can accept your code. This protects us, you, and everyone else using and contributing to Traffic Control. Once you have signed the CLA and had your first pull request merged, your name will be added to the [list of contributors](https://github.com/Comcast/traffic_control/blob/master/CONTRIBUTORS.md).
+Please take the opportunity of submitting your first PR to additionally include your name alphabetically in CONTRIBUTORS.md.
Making a pull request
---------------------
@@ -21,9 +21,9 @@ Following the project conventions will make the pull request process go faster a
#### Create an issue
-If you want to add a new feature, make a [Github issue](https://github.com/Comcast/traffic_control/issues) and discuss it with us first at [Traffic Control Google Group](https://groups.google.com/forum/#!forum/traffic_control-discuss). We might already be working on it, or there might be an existing way to do it.
+If you want to add a new feature, make a [JIRA issue](https://issues.apache.org/jira/browse/TC) and discuss it with us first on the [users@trafficcontrol.incubator.apache.org](mailto:users@trafficcontrol.incubator.apache.org) mailing list. We might already be working on it, or there might be an existing way to do it.
-If it's a bug fix, we need to know what the problem is and how to reproduce it so please create a [Github issue](https://github.com/Comcast/traffic_control/issues) for that as well.
+If it's a bug fix, make a [JIRA issue](https://issues.apache.org/jira/browse/TC) and discuss it with us first on the [users@trafficcontrol.incubator.apache.org](mailto:users@trafficcontrol.incubator.apache.org) mailing list. We need to know what the problem is and how to reproduce it so please create a [JIRA issue](https://issues.apache.org/jira/browse/TC) for that as well.
#### Documentation
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/DISCLAIMER
----------------------------------------------------------------------
diff --git a/DISCLAIMER b/DISCLAIMER
new file mode 100644
index 0000000..0c91830
--- /dev/null
+++ b/DISCLAIMER
@@ -0,0 +1 @@
+Apache Traffic Control is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index f286598..607f549 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,11 @@
-Traffic Control
-Copyright 2012-2015 Comcast Cable Communications Management, LLC
+Apache Traffic Control (incubating)
+Copyright 2016 The Apache Software Foundation
-This product includes software developed at Comcast (http://www.comcast.com/).
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of this software were developed at
+Comcast (http://www.comcast.com/).
+
+Portions of this software were developed at
+Cisco Systems, Inc. (http://www.cisco.com)
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index d24095c..9bd7e2e 100644
--- a/README.md
+++ b/README.md
@@ -1,20 +1,27 @@
-Traffic Control is an Open Source implementation of a Content Delivery Network.
+Apache Traffic Control (incubating) is an Open Source implementation of a Content Delivery Network.
#### Documentation
-* [Intro](http://traffic-control-cdn.net/docs/latest/index.html)
-* [CDN Basics](http://traffic-control-cdn.net/docs/latest/basics/index.html)
-* [Traffic Control Overview](http://traffic-control-cdn.net/docs/latest/overview/index.html)
-* [Administrator's Guide](http://traffic-control-cdn.net/docs/latest/admin/index.html)
-* [Developer's Guide](http://traffic-control-cdn.net/docs/latest/development/index.html)
+* [Intro](http://trafficcontrol.apache.org/docs/latest/index.html)
+* [CDN Basics](http://trafficcontrol.apache.org/docs/latest/basics/index.html)
+* [Traffic Control Overview](http://trafficcontrol.apache.org/docs/latest/overview/index.html)
+* [Administrator's Guide](http://trafficcontrol.apache.org/docs/latest/admin/index.html)
+* [Developer's Guide](http://trafficcontrol.apache.org/docs/latest/development/index.html)
####Questions, Comments, Bugs and More
-* [Frequently Asked Questions](http://traffic-control-cdn.net/docs/latest/faq/index.html)
-* [Found a bug or file a feature request](https://github.com/Comcast/traffic_control/issues)
-* [Ask a question about using Traffic Control](https://groups.google.com/forum/#!forum/traffic_control)
+* [Frequently Asked Questions](http://trafficcontrol.apache.org/docs/latest/faq/index.html)
+* [Found a bug or file a feature request](https://issues.apache.org/jira/browse/TC/?selectedTab=com.atlassian.jira.jira-projects-plugin:summary-panel)
+* [Subscribe to our users list](mailto:users-subscribe@trafficcontrol.incubator.apache.org)
+* [Subscribe to our dev list](mailto:dev-subscribe@trafficcontrol.incubator.apache.org)
+* [Search the email archives](https://lists.apache.org/list.html?dev@trafficcontrol.apache.org)
* [Check out the wiki](https://github.com/Comcast/traffic_control/wiki) for less formal documentation, design docs and roadmap discussions
##### News
+* 17-October 2016 Traffic Control is now Apache Traffic Control (incubating)!
+ Code has been moved to Apache, use the new repo https://github.com/apache/incubator-trafficcontrol to create PRs.
+ Mailing list have been updated, use the udpated links above. Website will be updated and moved soon.
+ Please bear with us as we move our project into the Apache incubator, and start aligning with the Apache
+ processes.
* 31-August 2016: Traffic Control 1.6.1 is released.
See https://github.com/Comcast/traffic_control/releases/tag/RELEASE-1.6.1 for the full change list.
* 29-July 2016: Traffic Control 1.6.0 is released.
@@ -48,5 +55,5 @@ Traffic Control is an Open Source implementation of a Content Delivery Network.
See https://github.com/Comcast/traffic_control/issues?utf8=%E2%9C%93&q=milestone%3A1.1.3 for the full change list.
* 16-April-2015: **Traffic Control is Open Source!**
- Certainly not perfect, but hopefully good enough to get going for an administrator using the rpms, and for brave developers to start looking in to helping the project move forward. Please see the **[Additional Install Notes for this release](http://traffic-control-cdn.net/docs/latest/faq/administration.html#why-is-my-crconfig-json-rejected)** when installing for the first time.
+ Certainly not perfect, but hopefully good enough to get going for an administrator using the rpms, and for brave developers to start looking in to helping the project move forward. Please see the **[Additional Install Notes for this release](http://trafficcontrol.apache.org/docs/latest/faq/administration.html#why-is-my-crconfig-json-rejected)** when installing for the first time.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/VERSION
----------------------------------------------------------------------
diff --git a/VERSION b/VERSION
index 27f9cd3..f8e233b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.8.0
+1.9.0
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/build/README.md
----------------------------------------------------------------------
diff --git a/build/README.md b/build/README.md
index cae71d9..8575572 100644
--- a/build/README.md
+++ b/build/README.md
@@ -1,6 +1,30 @@
# Rpm Build Instructions
+## Using `docker-compose`
+
+We are moving toward using a docker-based build system. This eliminates the need to maintain a local installation with all the
+build tools as well as ensuring that you are using the same versions as we use for testing.
+
+These are the versions of these tools we are using:
+* docker 1.12.2
+* docker-compose 1.8.1
+
+You can build from any repository/branch combination, but that repository must be available to `git clone ...`. Note that in the
+following `docker-compose` commands, you can limit building to one or more sub-projects by supplying arguments at the end. If none
+are supplied, then *all* will be run.
+
+Starting at the top-level of your trafficcontrol git clone (e.g. `~/src/incubator-trafficcontrol`):
+
+> cd infrastructure/docker/build
+> docker-compose build traffic_ops_build traffic_monitor_build ...
+> GITREPO=https://github.com/username/incubator-trafficcontrol BRANCH=mybranch docker-compose up traffic_ops_build traffic_monitor_build ...
+
+The resulting `.rpm` files will be created in the `artifacts` directory.
+
+
+## Building the old-fashioned way
+
rpm files for all sub-projects can be built using the file `build/build.sh`. If this script is given parameters, it will build only
those projects specified on the command line, e.g. `$ ./build/build.sh traffic_ops`. The prerequisites for each sub-project are
listed below.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/build/build.sh
----------------------------------------------------------------------
diff --git a/build/build.sh b/build/build.sh
index 5e19762..d82d249 100755
--- a/build/build.sh
+++ b/build/build.sh
@@ -1,7 +1,6 @@
#!/bin/bash
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/build/docker-build.sh
----------------------------------------------------------------------
diff --git a/build/docker-build.sh b/build/docker-build.sh
deleted file mode 100755
index 01005be..0000000
--- a/build/docker-build.sh
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/bin/bash
-#
-# docker-build.sh creates containers for building each component of traffic_control with
-# all needed dependencies. Once the build is complete, all rpms are copied into the "dist"
-# directory in the current directory.
-#
-# Usage: docker-build.sh [<options>]
-# Options:
-# -r <gitrepo> git repository to clone from (defaults to value of GITREPO env variable or
-# `https://github.com/Comcast/traffic_control'). Can be a URI or local directory.
-# -b <branch> branch (or tag) in repository to checkout (defaults to value of BRANCH env variable or `master')
-# -d <dir> directory to copy build artifacts (default is ./dist)
-
-export GITREPO="${GITREPO:-https://github.com/Comcast/traffic_control}"
-export BRANCH="${BRANCH:-master}"
-
-Usage() {
- echo "Usage:"
- echo " $0 [<option>...] [<project name>...]"
- echo " One of -a or list of projects must be provided."
- echo " Options:"
- echo " -a build all subprojects"
- echo " -h show usage"
- echo " -r <repository path>: repository (local directory or https) to clone from"
- echo " -b <branch name>: branch within repository"
- echo ""
-}
-
-while getopts :hacr:b:d: opt
-do
- case $opt in
- h) Usage
- exit 1;
- ;;
- a) buildall=1
- ;;
- r)
- GITREPO="$OPTARG"
- ;;
- b)
- BRANCH="$OPTARG"
- ;;
- *)
- echo "Invalid option: $opt"
- Usage
- exit 1;
- ;;
- esac
-done
-shift $((OPTIND-1))
-
-# anything remaining is list of projects to build
-if [[ -n $buildall ]]
-then
- projects="traffic_ops traffic_monitor traffic_router traffic_stats traffic_portal"
-else
- projects="$@"
-fi
-
-if [[ -z $projects ]]
-then
- echo "One of -a or list of project names must be provided"
- Usage
- exit 1
-fi
-
-
-# if repo is local directory, get absolute path
-if [[ -d $GITREPO ]]
-then
- GITREPO=$(cd $GITREPO && pwd)
-fi
-
-DIR="$( cd "$(dirname $( dirname "${BASH_SOURCE[0]}" ))" && pwd )"
-
-cd $DIR/infrastructure/docker/build
-dist=$(pwd)/artifacts
-
-cat <<-ENDMSG
- ********************************************************
-
- Building from git repository '$GITREPO' branch '$BRANCH'
- Artifacts will be delivered to '$dist'
-
- Projects to build: $projects
- ********************************************************
-
-ENDMSG
-
-# GITREPO and BRANCH are exported, so this will pick them up..
-docker-compose up
-
-echo "rpms created in $dist: "
-ls -l "$dist/."
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/build/functions.sh
----------------------------------------------------------------------
diff --git a/build/functions.sh b/build/functions.sh
index 74944f9..bb63530 100755
--- a/build/functions.sh
+++ b/build/functions.sh
@@ -1,7 +1,6 @@
#!/bin/bash
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/_static/theme_overrides.css
----------------------------------------------------------------------
diff --git a/docs/source/_static/theme_overrides.css b/docs/source/_static/theme_overrides.css
index 00a730f..4fed1af 100644
--- a/docs/source/_static/theme_overrides.css
+++ b/docs/source/_static/theme_overrides.css
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
/* override table width restrictions */
.wy-table-responsive table td, .wy-table-responsive table th {
/* !important prevents the common CSS stylesheets from
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/admin/index.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/index.rst b/docs/source/admin/index.rst
index eaef3a9..e92f5e2 100644
--- a/docs/source/admin/index.rst
+++ b/docs/source/admin/index.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/admin/quick_howto/dnssec.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/quick_howto/dnssec.rst b/docs/source/admin/quick_howto/dnssec.rst
index 6e41fe9..d336057 100644
--- a/docs/source/admin/quick_howto/dnssec.rst
+++ b/docs/source/admin/quick_howto/dnssec.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/admin/quick_howto/federations.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/quick_howto/federations.rst b/docs/source/admin/quick_howto/federations.rst
index 5bcb387..a17122c 100644
--- a/docs/source/admin/quick_howto/federations.rst
+++ b/docs/source/admin/quick_howto/federations.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/admin/quick_howto/index.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/quick_howto/index.rst b/docs/source/admin/quick_howto/index.rst
index 57f5727..96f098f 100644
--- a/docs/source/admin/quick_howto/index.rst
+++ b/docs/source/admin/quick_howto/index.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/admin/quick_howto/multi_site.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/quick_howto/multi_site.rst b/docs/source/admin/quick_howto/multi_site.rst
index 0811056..32b5436 100644
--- a/docs/source/admin/quick_howto/multi_site.rst
+++ b/docs/source/admin/quick_howto/multi_site.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/admin/quick_howto/regionalgeo.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/quick_howto/regionalgeo.rst b/docs/source/admin/quick_howto/regionalgeo.rst
index 58f8851..a903c8a 100644
--- a/docs/source/admin/quick_howto/regionalgeo.rst
+++ b/docs/source/admin/quick_howto/regionalgeo.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Cisco Systems, Inc.
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/admin/quick_howto/steering.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/quick_howto/steering.rst b/docs/source/admin/quick_howto/steering.rst
index 03f6b1d..1060f29 100644
--- a/docs/source/admin/quick_howto/steering.rst
+++ b/docs/source/admin/quick_howto/steering.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/admin/traffic_monitor.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/traffic_monitor.rst b/docs/source/admin/traffic_monitor.rst
index b7615fb..3a06e78 100644
--- a/docs/source/admin/traffic_monitor.rst
+++ b/docs/source/admin/traffic_monitor.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
@@ -33,7 +32,7 @@ The following are requirements to ensure an accurate set up:
1. Enter the Traffic Monitor server into Traffic Ops
2. Make sure the FQDN of the Traffic Monitor is resolvable in DNS.
-3. Install Traffic Monitor and perl mods: ``sudo yum -y install traffic_monitor perl-JSON perl-WWW-Curl``
+3. Install Traffic Monitor and Perl mods: ``sudo yum -y install traffic_monitor perl-JSON perl-WWW-Curl``
4. Take the config from Traffic Ops - run : ``sudo /opt/traffic_monitor/bin/traffic_monitor_config.pl``
Sample output: ::
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/admin/traffic_ops_config.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/traffic_ops_config.rst b/docs/source/admin/traffic_ops_config.rst
index 10acb86..0ca57da 100644
--- a/docs/source/admin/traffic_ops_config.rst
+++ b/docs/source/admin/traffic_ops_config.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
@@ -108,9 +107,9 @@ Below is a list of Traffic Server plugins that need to be configured in the para
+------------------+---------------+------------------------------------------------------+------------------------------------------------------------------------------------------------------------+
| Name | Config file | Description | Details |
+==================+===============+======================================================+============================================================================================================+
-| astats_over_http | package | The package version for the astats_over_http plugin. | `astats_over_http <http://traffic-control-cdn.net/downloads/index.html>`_ |
+| astats_over_http | package | The package version for the astats_over_http plugin. | `astats_over_http <http://trafficcontrol.apache.org/downloads/index.html>`_ |
+------------------+---------------+------------------------------------------------------+------------------------------------------------------------------------------------------------------------+
-| trafficserver | package | The package version for the trafficserver plugin. | `trafficserver <http://traffic-control-cdn.net/downloads/index.html>`_ |
+| trafficserver | package | The package version for the trafficserver plugin. | `trafficserver <http://trafficcontrol.apache.org/downloads/index.html>`_ |
+------------------+---------------+------------------------------------------------------+------------------------------------------------------------------------------------------------------------+
| regex_revalidate | plugin.config | The config to be used for regex_revalidate. | `regex_revalidate <https://docs.trafficserver.apache.org/en/5.3.x/reference/plugins/regex_remap.en.html>`_ |
| | | For example: --config regex_revalidate.config | |
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/admin/traffic_ops_extensions.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/traffic_ops_extensions.rst b/docs/source/admin/traffic_ops_extensions.rst
index f57277d..4aceebb 100644
--- a/docs/source/admin/traffic_ops_extensions.rst
+++ b/docs/source/admin/traffic_ops_extensions.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/admin/traffic_ops_install.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/traffic_ops_install.rst b/docs/source/admin/traffic_ops_install.rst
index 784b696..ca49461 100644
--- a/docs/source/admin/traffic_ops_install.rst
+++ b/docs/source/admin/traffic_ops_install.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
@@ -76,7 +75,7 @@ To begin the install:
1. Install Traffic Ops:
- Download the traffic_ops rpm package from http://traffic-control-cdn.net/downloads/index.html
+ Download the traffic_ops rpm package from http://trafficcontrol.apache.org/downloads/index.html
``sudo rpm -ivh traffic_ops-1.*.*-****.x86_64.rpm``
@@ -98,7 +97,7 @@ To begin the install:
Hit ENTER to continue:
- The first thing the post install will do is install additional packages needed from the yum repo.
+ The first thing postinstall will do is install additional packages needed from the yum repo.
Ater that, it will automatically proceed to installing the required Perl packages from CPAN.
@@ -378,5 +377,5 @@ To upgrade:
1. Enter the following command:``service traffic_ops stop``
2. Enter the following command:``yum upgrade traffic_ops``
-3. See :ref:`rl-ps` to run the post install.
+3. See :ref:`rl-ps` to run postinstall.
4. Enter the following command:``service traffic_ops start``
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/admin/traffic_ops_using.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/traffic_ops_using.rst b/docs/source/admin/traffic_ops_using.rst
index 4a50742..5b8525d 100644
--- a/docs/source/admin/traffic_ops_using.rst
+++ b/docs/source/admin/traffic_ops_using.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
@@ -595,7 +594,7 @@ Parameters in the Mid (parent) profile that influence this feature:
Multi Site Origin
+++++++++++++++++
-.. Note:: The Multi Site Origin feature is based upon a feature n ATS that has yet to be submitted to Traffic Server upstream, until it is, set this to 0, or use the ATS rpm supplied on the traffic-control-cdn.net website.
+.. Note:: The Multi Site Origin feature is based upon a feature n ATS that has yet to be submitted to Traffic Server upstream, until it is, set this to 0, or use the ATS rpm supplied on the trafficcontrol.apache.org website.
Normally, the mid servers are not aware of any redundancy at the origin layer. With Multi Site Origin enabled this changes - Traffic Server (and Traffic Ops) are now made aware of the fact there are multiple origins, and can be configured to do more advanced failover and loadbalancing actions.
@@ -1026,7 +1025,7 @@ Fairly straight forward, this button set the **dnssec.enabled** param to either
**Generate Keys**
-Generate Keys will generate dnssec keys for the CDN TLD as well as for each Delivery Service in the CDN. It is important to note that this button will create a new KSK for the TLD and, therefore, a new DS Record. Any time a new DS Record is created, it will need to be added to the parent zone of the TLD in order for DNSSEC to work properly. When a user clicks the **Generate Keys** button, they will be presented with a screen with the following fields:
+Generate Keys will generate DNSSEC keys for the CDN TLD as well as for each Delivery Service in the CDN. It is important to note that this button will create a new KSK for the TLD and, therefore, a new DS Record. Any time a new DS Record is created, it will need to be added to the parent zone of the TLD in order for DNSSEC to work properly. When a user clicks the **Generate Keys** button, they will be presented with a screen with the following fields:
- **CDN:** This is not editable and displays the CDN for which keys will be generated
- **ZSK Expiration (Days):** Sets how long (in days) the Zone Signing Key will be valid for the CDN and associated Delivery Services. The default is 30 days.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/admin/traffic_portal.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/traffic_portal.rst b/docs/source/admin/traffic_portal.rst
index 0c5b5b0..9e761b8 100644
--- a/docs/source/admin/traffic_portal.rst
+++ b/docs/source/admin/traffic_portal.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
@@ -24,7 +23,7 @@ The following are requirements to ensure an accurate set up:
**Installing Traffic Portal**
- - Download the Traffic Portal RPM from the traffic control `downloads <http://traffic-control-cdn.net/downloads/index.html>`_ page or build from `source <https://github.com/Comcast/traffic_control/tree/master/traffic_portal/build>`_.
+ - Download the Traffic Portal RPM from the traffic control `downloads <https://trafficcontrol.apache.org/downloads/index.html>`_ page or build from `source <https://github.com/apache/incubator-trafficcontrol/traffic_portal/build>`_.
- Copy the Traffic Portal RPM to your server
- curl --silent --location https://rpm.nodesource.com/setup_6.x | sudo bash -
- sudo yum install -y nodejs
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/admin/traffic_router.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/traffic_router.rst b/docs/source/admin/traffic_router.rst
index 8f274a7..01ab6b3 100644
--- a/docs/source/admin/traffic_router.rst
+++ b/docs/source/admin/traffic_router.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/admin/traffic_server.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/traffic_server.rst b/docs/source/admin/traffic_server.rst
index 393fcc5..1b99ce0 100644
--- a/docs/source/admin/traffic_server.rst
+++ b/docs/source/admin/traffic_server.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/admin/traffic_stats.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/traffic_stats.rst b/docs/source/admin/traffic_stats.rst
index e8d9e78..ae9d91b 100644
--- a/docs/source/admin/traffic_stats.rst
+++ b/docs/source/admin/traffic_stats.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
@@ -25,7 +24,7 @@ Installation
**Installing Traffic Stats:**
- - Download the Traffic Stats RPM from the traffic control `downloads <http://traffic-control-cdn.net/downloads/index.html>`_ page.
+ - Download the Traffic Stats RPM from the traffic control `downloads <https://trafficcontrol.apache.org/downloads/index.html>`_ page.
- Copy the Traffic Stats RPM to your server
- sudo rpm -ivh <traffic_stats rpm>
@@ -89,7 +88,7 @@ Configuration
In order for Traffic Ops users to see Grafana graphs, Grafana will need to allow anonymous access. Information on how to configure anonymous access can be found on the configuration page of the `Grafana Website <http://docs.grafana.org/installation/configuration/#authanonymous>`_.
- Traffic Ops uses custom dashboards to display information about individual delivery services or cache groups. In order for the custom graphs to display correctly, the `traffic_ops_*.js <https://github.com/Comcast/traffic_control/blob/master/traffic_stats/grafana/>`_ files need to be in the ``/usr/share/grafana/public/dashboards/`` directory on the grafana server. If your Grafana server is the same as your Traffic Stats server the RPM install process will take care of putting the files in place. If your grafana server is different from your Traffic Stats server, you will need to manually copy the files to the correct directory.
+ Traffic Ops uses custom dashboards to display information about individual delivery services or cache groups. In order for the custom graphs to display correctly, the `traffic_ops_*.js <https://github.com/apache/incubator-trafficcontrol/blob/master/traffic_stats/grafana/>`_ files need to be in the ``/usr/share/grafana/public/dashboards/`` directory on the grafana server. If your Grafana server is the same as your Traffic Stats server the RPM install process will take care of putting the files in place. If your grafana server is different from your Traffic Stats server, you will need to manually copy the files to the correct directory.
More information on custom scripted graphs can be found in the `scripted dashboards <http://docs.grafana.org/reference/scripting/>`_ section of the Grafana documentation.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/admin/traffic_vault.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/traffic_vault.rst b/docs/source/admin/traffic_vault.rst
index cf37b35..35be160 100644
--- a/docs/source/admin/traffic_vault.rst
+++ b/docs/source/admin/traffic_vault.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
@@ -171,7 +170,7 @@ One time configuration:
``riak-admin security grant riak_core.set_bucket on any to admin``
2. Add the search schema to Riak. This schema is a simple Apache Solr configuration file which will index all records on cdn, hostname, and deliveryservice.
- * Get the schema file by either cloning the project and going to `traffic_ops/app/config/misc/riak_search` or from `github <https://github.com/Comcast/traffic_control/tree/master/traffic_ops/app/conf/misc/riak_search>`_.
+ * Get the schema file by either cloning the project and going to `traffic_ops/app/config/misc/riak_search` or from `github <https://github.com/apache/incubator-trafficcontrol/tree/master/traffic_ops/app/conf/misc/riak_search>`_.
* Use curl to add the schema to riak: ``curl -kvs -XPUT "https://admin:pass@riakserver:8088/search/schema/sslkeys" -H 'Content-Type:application/xml' -d @sslkeys.xml``
3. Add search index to Riak
@@ -182,7 +181,7 @@ One time configuration:
Riak Search (using Apache Solr) will now index all NEW records that are added to the "ssl" bucket. The cdn, deliveryservice, and hostname fields are indexed and when a search is performed riak will return the indexed fields along with the crt and key values for a ssl record. In order to add the indexed fields to current records and to get the current records added, a standalone script needs to be run. The following explains how to run the script.
-1. Get script from github either by cloning the project and going to `traffic_ops/app/script` or from `here <https://github.com/Comcast/traffic_control/blob/master/traffic_ops/app/script/update_riak_for_search.pl>`_
+1. Get script from github either by cloning the project and going to `traffic_ops/app/script` or from `here <https://github.com/apache/incubator-trafficcontrol/blob/master/traffic_ops/app/script/update_riak_for_search.pl>`_
2. Run the script by performing the following command ``./update_riak_for_search.pl -to_url=https://traffic-ops.kabletown.net -to_un=user -to_pw=password``
Validate the search is working by querying against Riak directly:
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/basics/cache_revalidation.rst
----------------------------------------------------------------------
diff --git a/docs/source/basics/cache_revalidation.rst b/docs/source/basics/cache_revalidation.rst
index 70f7508..dc57346 100644
--- a/docs/source/basics/cache_revalidation.rst
+++ b/docs/source/basics/cache_revalidation.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/basics/caching_proxies.rst
----------------------------------------------------------------------
diff --git a/docs/source/basics/caching_proxies.rst b/docs/source/basics/caching_proxies.rst
index 624dbc1..af93730 100644
--- a/docs/source/basics/caching_proxies.rst
+++ b/docs/source/basics/caching_proxies.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/basics/content_delivery_networks.rst
----------------------------------------------------------------------
diff --git a/docs/source/basics/content_delivery_networks.rst b/docs/source/basics/content_delivery_networks.rst
index c696e9c..872018e 100644
--- a/docs/source/basics/content_delivery_networks.rst
+++ b/docs/source/basics/content_delivery_networks.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/basics/http_11.rst
----------------------------------------------------------------------
diff --git a/docs/source/basics/http_11.rst b/docs/source/basics/http_11.rst
index d53e91a..65d6d71 100644
--- a/docs/source/basics/http_11.rst
+++ b/docs/source/basics/http_11.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/basics/index.rst
----------------------------------------------------------------------
diff --git a/docs/source/basics/index.rst b/docs/source/basics/index.rst
index 0dae70f..23ee1da 100644
--- a/docs/source/basics/index.rst
+++ b/docs/source/basics/index.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/conf.py
----------------------------------------------------------------------
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 0bf12b7..d98a734 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -1,5 +1,4 @@
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -66,7 +65,7 @@ project = u'Traffic Control'
# The short X.Y version.
# version = '2_19_15 11:44'
# The full version, including alpha/beta/rc tags.
-release = '1.7-dev'
+release = '1.8-dev'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
@@ -203,7 +202,7 @@ latex_elements = {
# Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title, author, documentclass [howto/manual]).
latex_documents = [
- ('index', 'TrafficControl.tex', u'Traffic Control Documentation', 'Comcast Cable', 'manual'),
+ ('index', 'TrafficControl.tex', u'Traffic Control Documentation', 'Apache Software Foundation', 'manual'),
]
# The name of an image file (relative to this directory) to place at the top of
# the title page.
@@ -244,7 +243,7 @@ man_pages = [
# dir menu entry, description, category)
texinfo_documents = [
('index', 'Traffic Control', u'Traffic Control Documentation',
- u'Comcast Cable', 'Traffic Control', 'One line description of project.',
+ u'Apache Software Foundation', 'Traffic Control', 'One line description of project.',
'Miscellaneous'),
]
@@ -262,8 +261,8 @@ texinfo_documents = [
# Bibliographic Dublin Core info.
epub_title = u'Traffic Control'
-epub_author = u'Comcast Cable'
-epub_publisher = u'Comcast Cable'
+epub_author = u'Apache Software Foundation'
+epub_publisher = u'Apache Software Foundation'
# The language of the text. It defaults to the language option
# or en if the language is not set.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/index.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/index.rst b/docs/source/development/index.rst
index 70b05f4..851e463 100644
--- a/docs/source/development/index.rst
+++ b/docs/source/development/index.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_monitor.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_monitor.rst b/docs/source/development/traffic_monitor.rst
index 4a801bb..012cbb3 100644
--- a/docs/source/development/traffic_monitor.rst
+++ b/docs/source/development/traffic_monitor.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_monitor/traffic_monitor_api.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_monitor/traffic_monitor_api.rst b/docs/source/development/traffic_monitor/traffic_monitor_api.rst
index 5fbc422..0240fd4 100644
--- a/docs/source/development/traffic_monitor/traffic_monitor_api.rst
+++ b/docs/source/development/traffic_monitor/traffic_monitor_api.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops.rst b/docs/source/development/traffic_ops.rst
index c2957a5..5ec31e4 100644
--- a/docs/source/development/traffic_ops.rst
+++ b/docs/source/development/traffic_ops.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
@@ -164,7 +163,7 @@ Installing The Developer Environment
====================================
To install the Traffic Ops Developer environment:
-1. Clone the traffic_control repository from `github.com <https://github.com/Comcast/traffic_control>`_.
+1. Clone the traffic_control repository from `github.com <https://github.com/apache/incubator-trafficcontrol>`_.
2. Install the local dependencies using Carton (cpanfile).
::
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/routes.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/routes.rst b/docs/source/development/traffic_ops_api/routes.rst
index e378903..ec90963 100644
--- a/docs/source/development/traffic_ops_api/routes.rst
+++ b/docs/source/development/traffic_ops_api/routes.rst
@@ -25,7 +25,6 @@
</style>
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v11/asn.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v11/asn.rst b/docs/source/development/traffic_ops_api/v11/asn.rst
index bd10bb7..b6960d7 100644
--- a/docs/source/development/traffic_ops_api/v11/asn.rst
+++ b/docs/source/development/traffic_ops_api/v11/asn.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v11/cachegroup.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v11/cachegroup.rst b/docs/source/development/traffic_ops_api/v11/cachegroup.rst
index 30a5732..5278645 100644
--- a/docs/source/development/traffic_ops_api/v11/cachegroup.rst
+++ b/docs/source/development/traffic_ops_api/v11/cachegroup.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v11/cdn.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v11/cdn.rst b/docs/source/development/traffic_ops_api/v11/cdn.rst
index 1173c84..d2f742e 100644
--- a/docs/source/development/traffic_ops_api/v11/cdn.rst
+++ b/docs/source/development/traffic_ops_api/v11/cdn.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v11/changelog.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v11/changelog.rst b/docs/source/development/traffic_ops_api/v11/changelog.rst
index db73928..22b1ff1 100644
--- a/docs/source/development/traffic_ops_api/v11/changelog.rst
+++ b/docs/source/development/traffic_ops_api/v11/changelog.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v11/deliveryservice.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v11/deliveryservice.rst b/docs/source/development/traffic_ops_api/v11/deliveryservice.rst
index 73d8ffd..373c7ec 100644
--- a/docs/source/development/traffic_ops_api/v11/deliveryservice.rst
+++ b/docs/source/development/traffic_ops_api/v11/deliveryservice.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
@@ -27,7 +26,7 @@ Delivery Service
**GET /api/1.1/deliveryservices**
- Retrieves all delivery services. See also `Using Traffic Ops - Delivery Service <http://traffic-control-cdn.net/docs/latest/admin/traffic_ops_using.html#delivery-service>`_.
+ Retrieves all delivery services. See also `Using Traffic Ops - Delivery Service <http://trafficcontrol.apache.org/docs/latest/admin/traffic_ops_using.html#delivery-service>`_.
Authentication Required: Yes
@@ -64,8 +63,6 @@ Delivery Service
+--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
| ``edgeHeaderRewrite`` | string | The EDGE header rewrite actions to perform. |
+--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
- | ``exampleURLs`` | array | Entry points into the CDN for this deliveryservice. |
- +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
| ``geoLimitRedirectUrl`` | string | |
+--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
| ``geoLimit`` | string | - 0: None - no limitations |
@@ -107,8 +104,6 @@ Delivery Service
+--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
| ``longDesc2`` | string | Description field 2. |
+--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
- | ``matchList`` | array | Array of matchList hashes. |
- +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
| ``>>type`` | string | The type of MatchList (one of :ref:to-api-v11-types use_in_table='regex'). |
+--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
| ``>>setNumber`` | string | The set Number of the matchList. |
@@ -254,7 +249,7 @@ Delivery Service
**GET /api/1.1/deliveryservices/:id**
- Retrieves a specific delivery service. See also `Using Traffic Ops - Delivery Service <http://traffic-control-cdn.net/docs/latest/admin/traffic_ops_using.html#delivery-service>`_.
+ Retrieves a specific delivery service. See also `Using Traffic Ops - Delivery Service <http://trafficcontrol.apache.org/docs/latest/admin/traffic_ops_using.html#delivery-service>`_.
Authentication Required: Yes
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v11/hwinfo.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v11/hwinfo.rst b/docs/source/development/traffic_ops_api/v11/hwinfo.rst
index 8c5a9f3..cc45b38 100644
--- a/docs/source/development/traffic_ops_api/v11/hwinfo.rst
+++ b/docs/source/development/traffic_ops_api/v11/hwinfo.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v11/parameter.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v11/parameter.rst b/docs/source/development/traffic_ops_api/v11/parameter.rst
index db3a8d1..1b83d01 100644
--- a/docs/source/development/traffic_ops_api/v11/parameter.rst
+++ b/docs/source/development/traffic_ops_api/v11/parameter.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v11/phys_location.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v11/phys_location.rst b/docs/source/development/traffic_ops_api/v11/phys_location.rst
index 61d6c0b..6ebaff0 100644
--- a/docs/source/development/traffic_ops_api/v11/phys_location.rst
+++ b/docs/source/development/traffic_ops_api/v11/phys_location.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v11/profile.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v11/profile.rst b/docs/source/development/traffic_ops_api/v11/profile.rst
index 97075d8..5c37690 100644
--- a/docs/source/development/traffic_ops_api/v11/profile.rst
+++ b/docs/source/development/traffic_ops_api/v11/profile.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v11/region.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v11/region.rst b/docs/source/development/traffic_ops_api/v11/region.rst
index 7eda251..faddbb1 100644
--- a/docs/source/development/traffic_ops_api/v11/region.rst
+++ b/docs/source/development/traffic_ops_api/v11/region.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v11/role.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v11/role.rst b/docs/source/development/traffic_ops_api/v11/role.rst
index bd02f05..bf3337c 100644
--- a/docs/source/development/traffic_ops_api/v11/role.rst
+++ b/docs/source/development/traffic_ops_api/v11/role.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v11/server.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v11/server.rst b/docs/source/development/traffic_ops_api/v11/server.rst
index 61184f9..44f1292 100644
--- a/docs/source/development/traffic_ops_api/v11/server.rst
+++ b/docs/source/development/traffic_ops_api/v11/server.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v11/static_dns.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v11/static_dns.rst b/docs/source/development/traffic_ops_api/v11/static_dns.rst
index b840b90..c9d3a3d 100644
--- a/docs/source/development/traffic_ops_api/v11/static_dns.rst
+++ b/docs/source/development/traffic_ops_api/v11/static_dns.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v11/status.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v11/status.rst b/docs/source/development/traffic_ops_api/v11/status.rst
index 853f276..6a8c92a 100644
--- a/docs/source/development/traffic_ops_api/v11/status.rst
+++ b/docs/source/development/traffic_ops_api/v11/status.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v11/system.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v11/system.rst b/docs/source/development/traffic_ops_api/v11/system.rst
index ba3edbb..c4e53df 100644
--- a/docs/source/development/traffic_ops_api/v11/system.rst
+++ b/docs/source/development/traffic_ops_api/v11/system.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v11/to_extension.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v11/to_extension.rst b/docs/source/development/traffic_ops_api/v11/to_extension.rst
index 676a457..5ed2654 100644
--- a/docs/source/development/traffic_ops_api/v11/to_extension.rst
+++ b/docs/source/development/traffic_ops_api/v11/to_extension.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v11/type.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v11/type.rst b/docs/source/development/traffic_ops_api/v11/type.rst
index 2430b97..6c7806b 100644
--- a/docs/source/development/traffic_ops_api/v11/type.rst
+++ b/docs/source/development/traffic_ops_api/v11/type.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v11/user.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v11/user.rst b/docs/source/development/traffic_ops_api/v11/user.rst
index 5b06ccc..2ef5012 100644
--- a/docs/source/development/traffic_ops_api/v11/user.rst
+++ b/docs/source/development/traffic_ops_api/v11/user.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v12/asn.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/asn.rst b/docs/source/development/traffic_ops_api/v12/asn.rst
index fb45a07..d3ae765 100644
--- a/docs/source/development/traffic_ops_api/v12/asn.rst
+++ b/docs/source/development/traffic_ops_api/v12/asn.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v12/cache_stats.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/cache_stats.rst b/docs/source/development/traffic_ops_api/v12/cache_stats.rst
index d959c2b..dffc9a4 100644
--- a/docs/source/development/traffic_ops_api/v12/cache_stats.rst
+++ b/docs/source/development/traffic_ops_api/v12/cache_stats.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v12/cachegroup.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/cachegroup.rst b/docs/source/development/traffic_ops_api/v12/cachegroup.rst
index 5e6dc06..2d9f08d 100644
--- a/docs/source/development/traffic_ops_api/v12/cachegroup.rst
+++ b/docs/source/development/traffic_ops_api/v12/cachegroup.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v12/cdn.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/cdn.rst b/docs/source/development/traffic_ops_api/v12/cdn.rst
index 9a4daac..1819c69 100644
--- a/docs/source/development/traffic_ops_api/v12/cdn.rst
+++ b/docs/source/development/traffic_ops_api/v12/cdn.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v12/changelog.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/changelog.rst b/docs/source/development/traffic_ops_api/v12/changelog.rst
index edb4ff3..5cedbe0 100644
--- a/docs/source/development/traffic_ops_api/v12/changelog.rst
+++ b/docs/source/development/traffic_ops_api/v12/changelog.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
..
.. Licensed under the Apache License, Version 2.0 (the "License");
.. you may not use this file except in compliance with the License.