You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by fr...@apache.org on 2018/07/01 00:34:57 UTC
[trafficcontrol] branch master updated (6d69a88 -> 4c4b7d6)
This is an automated email from the ASF dual-hosted git repository.
friede pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git.
from 6d69a88 Conversion Utility to modify Traffic Ops profile based on conversion rules.
new f20dfcd remove DISCLAIMER -- no longer an incubating project
new 9d31995 remove -incubating from source tarball name
new 4c4b7d6 remove remnants of "incubator"
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
DISCLAIMER | 1 -
NOTICE | 2 +-
README.md | 4 ++--
build/functions.sh | 2 +-
docs/source/admin/traffic_portal/installation.rst | 2 +-
docs/source/admin/traffic_server.rst | 4 ++--
docs/source/admin/traffic_vault.rst | 2 +-
docs/source/development/building.rst | 2 +-
docs/source/faq/general.rst | 2 +-
infrastructure/docker/build/README.md | 2 +-
10 files changed, 11 insertions(+), 12 deletions(-)
delete mode 100644 DISCLAIMER
[trafficcontrol] 03/03: remove remnants of "incubator"
Posted by fr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
friede pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
commit 4c4b7d6b582ad13168f901c474341257b64d00b4
Author: Dan Kirkwood <da...@apache.org>
AuthorDate: Fri Jun 29 14:25:48 2018 -0600
remove remnants of "incubator"
---
NOTICE | 2 +-
README.md | 4 ++--
docs/source/admin/traffic_portal/installation.rst | 2 +-
docs/source/admin/traffic_server.rst | 4 ++--
docs/source/admin/traffic_vault.rst | 2 +-
docs/source/development/building.rst | 2 +-
docs/source/faq/general.rst | 2 +-
infrastructure/docker/build/README.md | 2 +-
8 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/NOTICE b/NOTICE
index 7a57cca..15efcb7 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 6b7a62f..2127b6c 100644
--- a/README.md
+++ b/README.md
@@ -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)
diff --git a/docs/source/admin/traffic_portal/installation.rst b/docs/source/admin/traffic_portal/installation.rst
index 55b064b..8d0a3ce 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 d4b817e..13ce92b 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 ead37a3..55fdc95 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 [...]
-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 ddd6f00..f74b4a1 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 7efa10e..bfaba10 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 9a9c613..122bf70 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`.
[trafficcontrol] 02/03: remove -incubating from source tarball name
Posted by fr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
friede pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
commit 9d31995267a316e6fb31c5365f245fb15b8b94bb
Author: Dan Kirkwood <da...@apache.org>
AuthorDate: Fri Jun 29 14:24:01 2018 -0600
remove -incubating from source tarball name
---
build/functions.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build/functions.sh b/build/functions.sh
index b99f17f..efdd2bc 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
[trafficcontrol] 01/03: remove DISCLAIMER -- no longer an
incubating project
Posted by fr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
friede pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
commit f20dfcd346be422d1236ddba9c7125c82197a33e
Author: Dan Kirkwood <da...@apache.org>
AuthorDate: Fri Jun 29 14:23:31 2018 -0600
remove DISCLAIMER -- no longer an incubating project
---
DISCLAIMER | 1 -
1 file changed, 1 deletion(-)
diff --git a/DISCLAIMER b/DISCLAIMER
deleted file mode 100644
index 0c91830..0000000
--- 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 [...]