limited closed pull request #2489: Remove `incubator` and `incubating` text
URL: https://github.com/apache/trafficcontrol/pull/2489
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/DISCLAIMER b/DISCLAIMER
deleted file mode 100644
index 0c9183093..000000000
--- a/DISCLAIMER
+++ /dev/null
@@ -1 +0,0 @@
-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.
diff --git a/NOTICE b/NOTICE
index 7a57cca85..15efcb70c 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,4 @@
-Apache Traffic Control (incubating)
+Apache Traffic Control
Copyright 2016-2018 The Apache Software Foundation
This product includes software developed at
diff --git a/README.md b/README.md
index 6b7a62fae..2127b6c33 100644
--- a/README.md
+++ b/README.md
@@ -17,9 +17,9 @@
under the License.
-->
-[](https://builds.apache.org/view/Incubator%20Projects/job/trafficcontrol-master-build/)
[](http://traffic-control-cdn.readthedocs.io/en/latest/?badge=latest)
+[](https://builds.apache.org/job/trafficcontrol-master-build/)
[](http://traffic-control-cdn.readthedocs.io/en/latest/?badge=latest)
-Apache Traffic Control (incubating) is an Open Source implementation of a
Content Delivery Network.
+Apache Traffic Control is an Open Source implementation of a Content Delivery
Network.
#### Documentation
* [Intro](http://traffic-control-cdn.readthedocs.io/en/latest/index.html)
diff --git a/build/functions.sh b/build/functions.sh
index b99f17f3c..efdd2bcf2 100755
--- a/build/functions.sh
+++ b/build/functions.sh
@@ -161,7 +161,7 @@ function createTarball() {
local projDir=$(cd "$1"; pwd)
local projName=trafficcontrol
local version=$(getVersion "$TC_DIR")
- local tarball="dist/apache-$projName-$version-incubating.tar.gz"
+ local tarball="dist/apache-$projName-$version.tar.gz"
local tardir=$(basename $tarball .tar.gz)
# Create a BULDNUMBER file and add to tarball
diff --git a/docs/source/admin/traffic_portal/installation.rst
b/docs/source/admin/traffic_portal/installation.rst
index 55b064bab..8d0a3cef7 100644
--- a/docs/source/admin/traffic_portal/installation.rst
+++ b/docs/source/admin/traffic_portal/installation.rst
@@ -23,7 +23,7 @@ The following are requirements to ensure an accurate set up:
**Installing Traffic Portal**
- - Download the Traffic Portal RPM from `Apache Jenkins
<https://builds.apache.org/view/S-Z/view/TrafficControl/job/incubator-trafficcontrol-master-build/>`_
or build the Traffic Portal RPM from source (./pkg -v traffic_portal_build).
+ - Download the Traffic Portal RPM from `Apache Jenkins
<https://builds.apache.org/job/trafficcontrol-master-build/>`_ or build the
Traffic Portal RPM from source (./pkg -v 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
diff --git a/docs/source/admin/traffic_server.rst
b/docs/source/admin/traffic_server.rst
index d4b817e25..13ce92b72 100644
--- a/docs/source/admin/traffic_server.rst
+++ b/docs/source/admin/traffic_server.rst
@@ -97,9 +97,9 @@ Installing the ORT script
https://builds.apache.org/view/S-Z/view/TrafficControl/
- Sample command: ::
+ Sample command (NOTE that the example name used here most likely no longer
exists): ::
- sudo wget
https://builds.apache.org/view/S-Z/view/TrafficControl/job/incubator-trafficcontrol-2.1.x-build/lastSuccessfulBuild/artifact/dist/traffic_ops_ort-2.1.0-6807.1dcd512f.el7.x86_64.rpm
+ sudo wget
https://builds.apache.org/job/trafficcontrol-2.1.x-build/lastSuccessfulBuild/artifact/dist/traffic_ops_ort-2.1.0-6807.1dcd512f.el7.x86_64.rpm
sudo yum install traffic_ops_ort*.rpm
#. Install modules required by ORT if needed: ``sudo yum -y install perl-JSON
perl-Crypt-SSLeay``
diff --git a/docs/source/admin/traffic_vault.rst
b/docs/source/admin/traffic_vault.rst
index ead37a32c..55fdc95a1 100644
--- a/docs/source/admin/traffic_vault.rst
+++ b/docs/source/admin/traffic_vault.rst
@@ -178,7 +178,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. This does not need to be done on new installs. 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/apache/incubator-trafficcontrol/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/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:
diff --git a/docs/source/development/building.rst
b/docs/source/development/building.rst
index ddd6f0056..f74b4a155 100644
--- a/docs/source/development/building.rst
+++ b/docs/source/development/building.rst
@@ -91,4 +91,4 @@ Usage
traffic_ops-2.1.0-6396.07033d6d.el7.x86_64.rpm
traffic_ops_ort-2.1.0-6396.07033d6d.el7.src.rpm
traffic_ops_ort-2.1.0-6396.07033d6d.el7.x86_64.rpm
- trafficcontrol-incubating-2.1.0.tar.gz
+ apache-trafficcontrol-2.1.0.tar.gz
diff --git a/docs/source/faq/general.rst b/docs/source/faq/general.rst
index 7efa10eb6..bfaba1019 100644
--- a/docs/source/faq/general.rst
+++ b/docs/source/faq/general.rst
@@ -52,4 +52,4 @@ What is Twelve Monkeys?
What license is Traffic Control released under?
===============================================
- See the `LICENSE file
<https://github.com/apache/incubator-trafficcontrol/blob/master/LICENSE>`_
+ See the `LICENSE file
<https://github.com/apache/trafficcontrol/blob/master/LICENSE>`_
diff --git a/infrastructure/docker/build/README.md
b/infrastructure/docker/build/README.md
index 9a9c6136e..122bf7042 100644
--- a/infrastructure/docker/build/README.md
+++ b/infrastructure/docker/build/README.md
@@ -20,4 +20,4 @@
# Building *trafficcontrol* using *docker-compose*
-Refer to the build instructions in the top-level
`incubating-trafficcontrol/BUILD.md`.
+Refer to the build instructions in the top-level `trafficcontrol/BUILD.md`.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
