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/06/19 19:39:10 UTC
[trafficcontrol] branch master updated (7f53466 -> c549e46)
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 7f53466 The PR modifies all files in the grove directory chaning any imports and other text references to 'incubator-trafficcontrol' to just 'trafficcontrol'
new 6560529 Fix icon images on website
new 48bf435 Fix jvd auth references
new c549e46 Remove incubator- references where appropriate
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:
.../app/public/images => docs/source/_static}/bad.png | Bin
.../public/images => docs/source/_static}/clock-black.png | Bin
.../app/public/images => docs/source/_static}/clock.png | Bin
.../app/public/images => docs/source/_static}/good.png | Bin
.../app/public/images => docs/source/_static}/graph.png | Bin
.../app/public/images => docs/source/_static}/info.png | Bin
.../app/public/images => docs/source/_static}/warning.png | Bin
docs/source/admin/traffic_ops/default_profiles.rst | 2 +-
docs/source/admin/traffic_ops/using.rst | 10 +++++-----
docs/source/admin/traffic_server.rst | 4 ++--
docs/source/admin/traffic_stats.rst | 4 ++--
docs/source/admin/traffic_vault.rst | 2 +-
docs/source/api/traffic_ops_api.rst | 2 +-
docs/source/api/v11/cdn.rst | 2 +-
docs/source/api/v12/cdn.rst | 2 +-
docs/source/conf.py | 10 +++++-----
docs/source/development/building.rst | 2 +-
docs/source/development/traffic_monitor.rst | 4 ++--
docs/source/development/traffic_ops.rst | 6 +++---
docs/source/faq/development.rst | 2 +-
docs/source/faq/general.rst | 2 +-
21 files changed, 27 insertions(+), 27 deletions(-)
copy {traffic_ops/app/public/images => docs/source/_static}/bad.png (100%)
copy {traffic_ops/app/public/images => docs/source/_static}/clock-black.png (100%)
copy {traffic_ops/app/public/images => docs/source/_static}/clock.png (100%)
copy {traffic_ops/app/public/images => docs/source/_static}/good.png (100%)
copy {traffic_ops/app/public/images => docs/source/_static}/graph.png (100%)
copy {traffic_ops/app/public/images => docs/source/_static}/info.png (100%)
copy {traffic_ops/app/public/images => docs/source/_static}/warning.png (100%)
[trafficcontrol] 02/03: Fix jvd auth references
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 48bf4351273a8c1a61361a06ad3c67c01370abb4
Author: Jan van Doorn <jv...@knutsel.com>
AuthorDate: Tue Jun 19 13:26:20 2018 -0600
Fix jvd auth references
---
docs/source/conf.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 5df82ca..9c22d15 100755
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -33,8 +33,8 @@
# -- Project information -----------------------------------------------------
project = 'Traffic Control'
-copyright = '2018, jvd'
-author = 'jvd'
+copyright = '2018, Apache Traffic Control'
+author = 'Apache Traffic Control'
# The short X.Y version
version = ''
@@ -141,8 +141,8 @@ latex_elements = {
# (source start file, target name, title,
# author, documentclass [howto, manual, or own class]).
latex_documents = [
- (master_doc, 'trafficcontrol.tex', 'trafficcontrol Documentation',
- 'jvd', 'manual'),
+ (master_doc, 'trafficcontrol.tex', 'Apache Traffic Control Documentation',
+ 'Apache Traffic Control', 'manual'),
]
@@ -151,7 +151,7 @@ latex_documents = [
# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [
- (master_doc, 'trafficcontrol', 'trafficcontrol Documentation',
+ (master_doc, 'Apache Traffic Control', 'Apache Traffic Control Documentation',
[author], 1)
]
[trafficcontrol] 01/03: Fix icon images on website
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 65605295e475b4517ecc5b5157d1d2bb3959b435
Author: Jan van Doorn <jv...@knutsel.com>
AuthorDate: Tue Jun 19 13:25:07 2018 -0600
Fix icon images on website
---
docs/source/_static/bad.png | Bin 0 -> 472 bytes
docs/source/_static/clock-black.png | Bin 0 -> 427 bytes
docs/source/_static/clock.png | Bin 0 -> 1514 bytes
docs/source/_static/good.png | Bin 0 -> 617 bytes
docs/source/_static/graph.png | Bin 0 -> 483 bytes
docs/source/_static/info.png | Bin 0 -> 3379 bytes
docs/source/_static/warning.png | Bin 0 -> 595 bytes
docs/source/admin/traffic_ops/using.rst | 10 +++++-----
docs/source/development/traffic_ops.rst | 4 ++--
9 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/docs/source/_static/bad.png b/docs/source/_static/bad.png
new file mode 100644
index 0000000..485e3da
Binary files /dev/null and b/docs/source/_static/bad.png differ
diff --git a/docs/source/_static/clock-black.png b/docs/source/_static/clock-black.png
new file mode 100644
index 0000000..4783c01
Binary files /dev/null and b/docs/source/_static/clock-black.png differ
diff --git a/docs/source/_static/clock.png b/docs/source/_static/clock.png
new file mode 100644
index 0000000..a4a5f1f
Binary files /dev/null and b/docs/source/_static/clock.png differ
diff --git a/docs/source/_static/good.png b/docs/source/_static/good.png
new file mode 100644
index 0000000..84d96cd
Binary files /dev/null and b/docs/source/_static/good.png differ
diff --git a/docs/source/_static/graph.png b/docs/source/_static/graph.png
new file mode 100644
index 0000000..4502a2d
Binary files /dev/null and b/docs/source/_static/graph.png differ
diff --git a/docs/source/_static/info.png b/docs/source/_static/info.png
new file mode 100644
index 0000000..3e1125c
Binary files /dev/null and b/docs/source/_static/info.png differ
diff --git a/docs/source/_static/warning.png b/docs/source/_static/warning.png
new file mode 100644
index 0000000..57cccda
Binary files /dev/null and b/docs/source/_static/warning.png differ
diff --git a/docs/source/admin/traffic_ops/using.rst b/docs/source/admin/traffic_ops/using.rst
index c7273e5..97e20cb 100644
--- a/docs/source/admin/traffic_ops/using.rst
+++ b/docs/source/admin/traffic_ops/using.rst
@@ -13,11 +13,11 @@
.. limitations under the License.
..
-.. |graph| image:: ../../../../traffic_ops/app/public/images/graph.png
-.. |info| image:: ../../../../traffic_ops/app/public/images/info.png
-.. |checkmark| image:: ../../../../traffic_ops/app/public/images/good.png
-.. |X| image:: ../../../../traffic_ops/app/public/images/bad.png
-.. |clock| image:: ../../../../traffic_ops/app/public/images/clock-black.png
+.. |graph| image:: ../../_static/graph.png
+.. |info| image:: ../../_static//info.png
+.. |checkmark| image:: ../../_static/good.png
+.. |X| image:: ../../_static/bad.png
+.. |clock| image:: ../../_static/clock-black.png
Traffic Ops - Using
%%%%%%%%%%%%%%%%%%%
diff --git a/docs/source/development/traffic_ops.rst b/docs/source/development/traffic_ops.rst
index cb43330..2ca1882 100644
--- a/docs/source/development/traffic_ops.rst
+++ b/docs/source/development/traffic_ops.rst
@@ -280,9 +280,9 @@ Check Extensions
In other words, check extensions are scripts that, after registering with Traffic Ops, have a column reserved in the "Health->Server Checks" view and that usually run periodically out of cron.
-.. |checkmark| image:: ../../../traffic_ops/app/public/images/good.png
+.. |checkmark| image:: ../_static/good.png
-.. |X| image:: ../../../traffic_ops/app/public/images/bad.png
+.. |X| image:: ../_static/bad.png
It is the responsibility of the check extension script to iterate over the servers it wants to check and post the results.
[trafficcontrol] 03/03: Remove incubator- references where
appropriate
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 c549e46b69d07fbab5549075c98bba24b237e9a6
Author: Jan van Doorn <jv...@knutsel.com>
AuthorDate: Tue Jun 19 13:35:32 2018 -0600
Remove incubator- references where appropriate
---
docs/source/admin/traffic_ops/default_profiles.rst | 2 +-
docs/source/admin/traffic_server.rst | 4 ++--
docs/source/admin/traffic_stats.rst | 4 ++--
docs/source/admin/traffic_vault.rst | 2 +-
docs/source/api/traffic_ops_api.rst | 2 +-
docs/source/api/v11/cdn.rst | 2 +-
docs/source/api/v12/cdn.rst | 2 +-
docs/source/development/building.rst | 2 +-
docs/source/development/traffic_monitor.rst | 4 ++--
docs/source/development/traffic_ops.rst | 2 +-
docs/source/faq/development.rst | 2 +-
docs/source/faq/general.rst | 2 +-
12 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/docs/source/admin/traffic_ops/default_profiles.rst b/docs/source/admin/traffic_ops/default_profiles.rst
index 9b629be..75a71d2 100644
--- a/docs/source/admin/traffic_ops/default_profiles.rst
+++ b/docs/source/admin/traffic_ops/default_profiles.rst
@@ -24,7 +24,7 @@ Traffic Ops - Default Profiles
Traffic Ops has the concept of :ref:`rl-working-with-profiles`, which are an integral function within Traffic Ops. To get started, a set of default Traffic Ops profiles need to be imported into Traffic Ops
to get started to support Traffic Control components Traffic Router, Traffic Monitor, and Apache Traffic Server.
-`Download Default Profiles from here <http://trafficcontrol.incubator.apache.org/downloads/profiles/>`_
+`Download Default Profiles from here <http://trafficcontrol.apache.org/downloads/profiles/>`_
.. _rl-to-profiles-min-needed:
diff --git a/docs/source/admin/traffic_server.rst b/docs/source/admin/traffic_server.rst
index 828cb47..d4b817e 100644
--- a/docs/source/admin/traffic_server.rst
+++ b/docs/source/admin/traffic_server.rst
@@ -25,11 +25,11 @@ Installing Traffic Server
#. Build the astats RPM using the appropriate version number: ::
- https://github.com/apache/incubator-trafficcontrol/tree/<version>/traffic_server
+ https://github.com/apache/trafficcontrol/tree/<version>/traffic_server
Sample link: ::
- https://github.com/apache/incubator-trafficcontrol/tree/master/traffic_server
+ https://github.com/apache/trafficcontrol/tree/master/traffic_server
#. Install Traffic Server and astats: ::
diff --git a/docs/source/admin/traffic_stats.rst b/docs/source/admin/traffic_stats.rst
index a1d20b3..d484f59 100644
--- a/docs/source/admin/traffic_stats.rst
+++ b/docs/source/admin/traffic_stats.rst
@@ -25,7 +25,7 @@ Installation
**Installing Traffic Stats:**
- See the `downloads <https://trafficcontrol.apache.org/downloads/index.html>`_ page for Traffic Control to get the latest release.
- - Follow our build `intructions <https://github.com/apache/incubator-trafficcontrol/tree/master/build>`_ to generate an RPM.
+ - Follow our build `intructions <https://github.com/apache/trafficcontrol/tree/master/build>`_ to generate an RPM.
- Copy the RPM to your server
- perform the following command: ``sudo rpm -ivh <traffic_stats rpm>``
@@ -89,7 +89,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/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 t [...]
+ 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/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 i [...]
More information on custom scripted graphs can be found in the `scripted dashboards <http://docs.grafana.org/reference/scripting/>`_ section of the Grafana documentation.
diff --git a/docs/source/admin/traffic_vault.rst b/docs/source/admin/traffic_vault.rst
index 2f6508a..ead37a3 100644
--- a/docs/source/admin/traffic_vault.rst
+++ b/docs/source/admin/traffic_vault.rst
@@ -167,7 +167,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/apache/incubator-trafficcontrol/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/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
diff --git a/docs/source/api/traffic_ops_api.rst b/docs/source/api/traffic_ops_api.rst
index 0ced0ae..74649a5 100644
--- a/docs/source/api/traffic_ops_api.rst
+++ b/docs/source/api/traffic_ops_api.rst
@@ -193,4 +193,4 @@ The 3 most common errors returned by Traffic Ops are:
TrafficOps Native Client Libraries
----------------------------------
-TrafficOps client libraries are available in both Golang and Python. You can read more about them at https://github.com/apache/incubator-trafficcontrol/tree/master/traffic_control/clients
+TrafficOps client libraries are available in both Golang and Python. You can read more about them at https://github.com/apache/trafficcontrol/tree/master/traffic_control/clients
diff --git a/docs/source/api/v11/cdn.rst b/docs/source/api/v11/cdn.rst
index 91c926c..f1fd2b4 100644
--- a/docs/source/api/v11/cdn.rst
+++ b/docs/source/api/v11/cdn.rst
@@ -384,7 +384,7 @@ Metrics
**GET /api/1.1/cdns/metric_types/:metric/start_date/:start/end_date/:end**
-*Note: this route is not currently implemented in Traffic Ops. See https://github.com/apache/incubator-trafficcontrol/issues/2309*
+*Note: this route is not currently implemented in Traffic Ops. See https://github.com/apache/trafficcontrol/issues/2309*
Retrieves edge metrics of one or all locations (cache groups).
diff --git a/docs/source/api/v12/cdn.rst b/docs/source/api/v12/cdn.rst
index 7cdf9b0..9bf791f 100644
--- a/docs/source/api/v12/cdn.rst
+++ b/docs/source/api/v12/cdn.rst
@@ -642,7 +642,7 @@ Metrics
**GET /api/1.2/cdns/metric_types/:metric/start_date/:start/end_date/:end**
-*Note: this route is not currently implemented in Traffic Ops. See https://github.com/apache/incubator-trafficcontrol/issues/2309*
+*Note: this route is not currently implemented in Traffic Ops. See https://github.com/apache/trafficcontrol/issues/2309*
Retrieves edge metrics of one or all locations (cache groups).
diff --git a/docs/source/development/building.rst b/docs/source/development/building.rst
index 87e68e9..ddd6f00 100644
--- a/docs/source/development/building.rst
+++ b/docs/source/development/building.rst
@@ -62,7 +62,7 @@ If any project names are provided on the command line, only those will be built.
Otherwise, all projects are built.
All artifacts (rpms, logs, source tar ball) are copied to ``dist`` at the top level of the
-``incubator-trafficcontrol`` directory.
+``trafficcontrol`` directory.
Example
~~~~~~~
diff --git a/docs/source/development/traffic_monitor.rst b/docs/source/development/traffic_monitor.rst
index 552500c..74ac421 100644
--- a/docs/source/development/traffic_monitor.rst
+++ b/docs/source/development/traffic_monitor.rst
@@ -281,8 +281,8 @@ Installing The Developer Environment
To install the Traffic Monitor Developer environment:
1. Install `go` version 1.7 or greater, from https://golang.org/doc/install and https://golang.org/doc/code.html
-2. Clone the traffic_control repository using Git, into ``$GOPATH/src/github.com/apache/incubator-trafficcontrol``
-3. Change directories into ``$GOPATH/src/github.com/apache/incubator-trafficcontrol/traffic_monitor_golang/traffic_monitor``
+2. Clone the trafficcontrol repository using Git, into ``$GOPATH/src/github.com/apache/trafficcontrol``
+3. Change directories into ``$GOPATH/src/github.com/apache/trafficcontrol/traffic_monitor_golang/traffic_monitor``
4. Run ``./build.sh``
Test Cases
diff --git a/docs/source/development/traffic_ops.rst b/docs/source/development/traffic_ops.rst
index 2ca1882..9bab72d 100644
--- a/docs/source/development/traffic_ops.rst
+++ b/docs/source/development/traffic_ops.rst
@@ -167,7 +167,7 @@ Installing The Developer Environment
====================================
To install the Traffic Ops Developer environment:
-1. Clone the traffic_control repository from `github.com <https://github.com/apache/incubator-trafficcontrol>`_.
+1. Clone the trafficcontrol repository from `github.com <https://github.com/apache/trafficcontrol>`_.
2. Install the local dependencies using Carton (cpanfile).
::
diff --git a/docs/source/faq/development.rst b/docs/source/faq/development.rst
index 8518eeb..8d6f703 100644
--- a/docs/source/faq/development.rst
+++ b/docs/source/faq/development.rst
@@ -18,4 +18,4 @@ Development
How can I become involved?
==========================
- See our `CONTRIBUTING <https://github.com/apache/incubator-trafficcontrol/blob/master/CONTRIBUTING.md>`_ page.
+ See our `CONTRIBUTING <https://github.com/apache/trafficcontrol/blob/master/CONTRIBUTING.md>`_ page.
diff --git a/docs/source/faq/general.rst b/docs/source/faq/general.rst
index fe77e3a..7efa10e 100644
--- a/docs/source/faq/general.rst
+++ b/docs/source/faq/general.rst
@@ -36,7 +36,7 @@ Who is using Traffic Control?
How do I get help with Traffic Control?
=======================================
- Hop on to our Slack Channel by filling out `this form <https://goo.gl/Suzakj>`_, or send a question to our mailing list `here <ma...@trafficcontrol.incubator.apache.org>`_.
+ Hop on to our Slack Channel by filling out `this form <https://goo.gl/Suzakj>`_, or send a question to our mailing list `here <ma...@trafficcontrol.apache.org>`_.
What is Rascal?
===============