Skip to content

Commit

Permalink
remove remnants of "incubator"
Browse files Browse the repository at this point in the history
  • Loading branch information
dangogh authored and limited committed Jul 1, 2018
1 parent 9d31995 commit 4c4b7d6
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion NOTICE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Apache Traffic Control (incubating)
Apache Traffic Control
Copyright 2016-2018 The Apache Software Foundation

This product includes software developed at
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
under the License.
-->

[![Build Status](https://builds.apache.org/buildStatus/icon?job=trafficcontrol-master-build)](https://builds.apache.org/view/Incubator%20Projects/job/trafficcontrol-master-build/) [![Documentation Status](https://readthedocs.org/projects/traffic-control-cdn/badge/?version=latest)](http://traffic-control-cdn.readthedocs.io/en/latest/?badge=latest)
[![Build Status](https://builds.apache.org/buildStatus/icon?job=trafficcontrol-master-build)](https://builds.apache.org/job/trafficcontrol-master-build/) [![Documentation Status](https://readthedocs.org/projects/traffic-control-cdn/badge/?version=latest)](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)
Expand Down
2 changes: 1 addition & 1 deletion docs/source/admin/traffic_portal/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docs/source/admin/traffic_server.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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``
Expand Down
2 changes: 1 addition & 1 deletion docs/source/admin/traffic_vault.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion docs/source/development/building.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion docs/source/faq/general.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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>`_
2 changes: 1 addition & 1 deletion infrastructure/docker/build/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`.

0 comments on commit 4c4b7d6

Please sign in to comment.