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:44 UTC
[23/26] incubator-trafficcontrol git commit: merge master
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v12/deliveryservice.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/deliveryservice.rst b/docs/source/development/traffic_ops_api/v12/deliveryservice.rst
index a6a6b66..9d86ffd 100644
--- a/docs/source/development/traffic_ops_api/v12/deliveryservice.rst
+++ b/docs/source/development/traffic_ops_api/v12/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.
@@ -25,9 +24,9 @@ Delivery Service
/api/1.2/deliveryservices
+++++++++++++++++++++++++
-**GET /api/1.2/deliveryservices.json**
+**GET /api/1.2/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.2/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
@@ -482,7 +477,7 @@ Delivery Service
Health
++++++
-**GET /api/1.2/deliveryservices/:id/state.json**
+**GET /api/1.2/deliveryservices/:id/state**
Retrieves the failover state for a delivery service.
@@ -531,7 +526,7 @@ Health
|
-**GET /api/1.2/deliveryservices/:id/health.json**
+**GET /api/1.2/deliveryservices/:id/health**
Retrieves the health of all locations (cache groups) for a delivery service.
@@ -581,7 +576,7 @@ Health
|
-**GET /api/1.2/deliveryservices/:id/capacity.json**
+**GET /api/1.2/deliveryservices/:id/capacity**
Retrieves the capacity percentages of a delivery service.
@@ -629,7 +624,7 @@ Health
|
-**GET /api/1.2/deliveryservices/:id/routing.json**
+**GET /api/1.2/deliveryservices/:id/routing**
Retrieves the routing method percentages of a delivery service.
@@ -693,7 +688,7 @@ Health
Server
++++++
-**GET /api/1.2/deliveryserviceserver.json**
+**GET /api/1.2/deliveryserviceserver**
Authentication Required: Yes
@@ -749,7 +744,7 @@ Server
SSL Keys
+++++++++
-**GET /api/1.2/deliveryservices/xmlId/:xmlid/sslkeys.json**
+**GET /api/1.2/deliveryservices/xmlId/:xmlid/sslkeys**
Authentication Required: Yes
@@ -774,29 +769,34 @@ SSL Keys
**Response Properties**
- +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
- | Parameter | Type | Description |
- +==================+========+=========================================================================================================================================+
- | ``crt`` | string | base64 encoded crt file for delivery service |
- +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
- | ``csr`` | string | base64 encoded csr file for delivery service |
- +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
- | ``key`` | string | base64 encoded private key file for delivery service |
- +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
- | ``businessUnit`` | string | The business unit entered by the user when generating certs. Field is optional and if not provided by the user will not be in response |
- +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
- | ``city`` | string | The city entered by the user when generating certs. Field is optional and if not provided by the user will not be in response |
- +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
- | ``organization`` | string | The organization entered by the user when generating certs. Field is optional and if not provided by the user will not be in response |
- +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
- | ``hostname`` | string | The hostname entered by the user when generating certs. Field is optional and if not provided by the user will not be in response |
- +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
- | ``country`` | string | The country entered by the user when generating certs. Field is optional and if not provided by the user will not be in response |
- +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
- | ``state`` | string | The state entered by the user when generating certs. Field is optional and if not provided by the user will not be in response |
- +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
- | ``version`` | string | The version of the certificate record in Riak |
- +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | Parameter | Type | Description |
+ +=====================+========+=========================================================================================================================================+
+ | ``crt`` | string | base64 encoded crt file for delivery service |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | ``csr`` | string | base64 encoded csr file for delivery service |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | ``key`` | string | base64 encoded private key file for delivery service |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | ``cdn`` | string | The CDN of the delivery service for which the certs were generated. |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | ``deliveryservice`` | string | The XML ID of the delivery service for which the cert was generated. |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | ``businessUnit`` | string | The business unit entered by the user when generating certs. Field is optional and if not provided by the user will not be in response |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | ``city`` | string | The city entered by the user when generating certs. Field is optional and if not provided by the user will not be in response |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | ``organization`` | string | The organization entered by the user when generating certs. Field is optional and if not provided by the user will not be in response |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | ``hostname`` | string | The hostname generated by Traffic Ops that is used as the common name when generating the certificate. |
+ | | | This will be a FQDN for DNS delivery services and a wildcard URL for HTTP delivery services. |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | ``country`` | string | The country entered by the user when generating certs. Field is optional and if not provided by the user will not be in response |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | ``state`` | string | The state entered by the user when generating certs. Field is optional and if not provided by the user will not be in response |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | ``version`` | string | The version of the certificate record in Riak |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
**Response Example** ::
@@ -807,6 +807,8 @@ SSL Keys
"key": "key",
"csr": "csr"
},
+ "deliveryservice": "my-ds",
+ "cdn": "qa",
"businessUnit": "CDN_Eng",
"city": "Denver",
"organization": "KableTown",
@@ -819,7 +821,7 @@ SSL Keys
|
-**GET /api/1.2/deliveryservices/hostname/:hostname/sslkeys.json**
+**GET /api/1.2/deliveryservices/hostname/:hostname/sslkeys**
Authentication Required: Yes
@@ -844,29 +846,34 @@ SSL Keys
**Response Properties**
- +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
- | Parameter | Type | Description |
- +==================+========+=========================================================================================================================================+
- | ``crt`` | string | base64 encoded crt file for delivery service |
- +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
- | ``csr`` | string | base64 encoded csr file for delivery service |
- +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
- | ``key`` | string | base64 encoded private key file for delivery service |
- +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
- | ``businessUnit`` | string | The business unit entered by the user when generating certs. Field is optional and if not provided by the user will not be in response |
- +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
- | ``city`` | string | The city entered by the user when generating certs. Field is optional and if not provided by the user will not be in response |
- +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
- | ``organization`` | string | The organization entered by the user when generating certs. Field is optional and if not provided by the user will not be in response |
- +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
- | ``hostname`` | string | The hostname entered by the user when generating certs. Field is optional and if not provided by the user will not be in response |
- +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
- | ``country`` | string | The country entered by the user when generating certs. Field is optional and if not provided by the user will not be in response |
- +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
- | ``state`` | string | The state entered by the user when generating certs. Field is optional and if not provided by the user will not be in response |
- +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
- | ``version`` | string | The version of the certificate record in Riak |
- +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | Parameter | Type | Description |
+ +=====================+========+=========================================================================================================================================+
+ | ``crt`` | string | base64 encoded crt file for delivery service |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | ``csr`` | string | base64 encoded csr file for delivery service |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | ``key`` | string | base64 encoded private key file for delivery service |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | ``cdn`` | string | The CDN of the delivery service for which the certs were generated. |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | ``deliveryservice`` | string | The XML ID of the delivery service for which the cert was generated. |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | ``businessUnit`` | string | The business unit entered by the user when generating certs. Field is optional and if not provided by the user will not be in response |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | ``city`` | string | The city entered by the user when generating certs. Field is optional and if not provided by the user will not be in response |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | ``organization`` | string | The organization entered by the user when generating certs. Field is optional and if not provided by the user will not be in response |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | ``hostname`` | string | The hostname generated by Traffic Ops that is used as the common name when generating the certificate. |
+ | | | This will be a FQDN for DNS delivery services and a wildcard URL for HTTP delivery services. |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | ``country`` | string | The country entered by the user when generating certs. Field is optional and if not provided by the user will not be in response |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | ``state`` | string | The state entered by the user when generating certs. Field is optional and if not provided by the user will not be in response |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+ | ``version`` | string | The version of the certificate record in Riak |
+ +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
**Response Example** ::
@@ -877,6 +884,8 @@ SSL Keys
"key": "key",
"csr": "csr"
},
+ "deliveryservice": "my-ds",
+ "cdn": "qa",
"businessUnit": "CDN_Eng",
"city": "Denver",
"organization": "KableTown",
@@ -889,7 +898,7 @@ SSL Keys
|
-**GET /api/1.2/deliveryservices/xmlId/:xmlid/sslkeys/delete.json**
+**GET /api/1.2/deliveryservices/xmlId/:xmlid/sslkeys/delete**
Authentication Required: Yes
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v12/deliveryservice_stats.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/deliveryservice_stats.rst b/docs/source/development/traffic_ops_api/v12/deliveryservice_stats.rst
index 9d6c21f..8d9dadb 100644
--- a/docs/source/development/traffic_ops_api/v12/deliveryservice_stats.rst
+++ b/docs/source/development/traffic_ops_api/v12/deliveryservice_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.
@@ -27,7 +26,7 @@ Delivery Service Statistics
**GET /api/1.2/deliveryservice_stats.json**
- Retrieves statistics on the delivery services. See also `Using Traffic Ops - Delivery Service <http://traffic-control-cdn.net/docs/latest/admin/traffic_ops_using.html#delivery-service>`_.
+ Retrieves statistics on the 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
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_ops_api/v12/division.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/division.rst b/docs/source/development/traffic_ops_api/v12/division.rst
index 2d9403a..934c393 100644
--- a/docs/source/development/traffic_ops_api/v12/division.rst
+++ b/docs/source/development/traffic_ops_api/v12/division.rst
@@ -1,5 +1,4 @@
..
-.. Copyright 2016 Cisco
..
.. 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/federation.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/federation.rst b/docs/source/development/traffic_ops_api/v12/federation.rst
index 54038a8..a15922e 100644
--- a/docs/source/development/traffic_ops_api/v12/federation.rst
+++ b/docs/source/development/traffic_ops_api/v12/federation.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/hwinfo.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/hwinfo.rst b/docs/source/development/traffic_ops_api/v12/hwinfo.rst
index 24ce897..2da59c5 100644
--- a/docs/source/development/traffic_ops_api/v12/hwinfo.rst
+++ b/docs/source/development/traffic_ops_api/v12/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/v12/influxdb.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/influxdb.rst b/docs/source/development/traffic_ops_api/v12/influxdb.rst
index b2bdbd5..ca82cf5 100644
--- a/docs/source/development/traffic_ops_api/v12/influxdb.rst
+++ b/docs/source/development/traffic_ops_api/v12/influxdb.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/parameter.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/parameter.rst b/docs/source/development/traffic_ops_api/v12/parameter.rst
index 81c00c3..307d4c7 100644
--- a/docs/source/development/traffic_ops_api/v12/parameter.rst
+++ b/docs/source/development/traffic_ops_api/v12/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/v12/phys_location.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/phys_location.rst b/docs/source/development/traffic_ops_api/v12/phys_location.rst
index 53c561f..b9e6cb6 100644
--- a/docs/source/development/traffic_ops_api/v12/phys_location.rst
+++ b/docs/source/development/traffic_ops_api/v12/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/v12/profile.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/profile.rst b/docs/source/development/traffic_ops_api/v12/profile.rst
index 5892272..bec8f9f 100644
--- a/docs/source/development/traffic_ops_api/v12/profile.rst
+++ b/docs/source/development/traffic_ops_api/v12/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/v12/profile_parameter.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/profile_parameter.rst b/docs/source/development/traffic_ops_api/v12/profile_parameter.rst
index bc16128..31b5789 100644
--- a/docs/source/development/traffic_ops_api/v12/profile_parameter.rst
+++ b/docs/source/development/traffic_ops_api/v12/profile_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/v12/region.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/region.rst b/docs/source/development/traffic_ops_api/v12/region.rst
index 8129854..2fd96d9 100644
--- a/docs/source/development/traffic_ops_api/v12/region.rst
+++ b/docs/source/development/traffic_ops_api/v12/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/v12/role.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/role.rst b/docs/source/development/traffic_ops_api/v12/role.rst
index 247c0cb..b993c97 100644
--- a/docs/source/development/traffic_ops_api/v12/role.rst
+++ b/docs/source/development/traffic_ops_api/v12/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/v12/server.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/server.rst b/docs/source/development/traffic_ops_api/v12/server.rst
index 316f126..3700160 100644
--- a/docs/source/development/traffic_ops_api/v12/server.rst
+++ b/docs/source/development/traffic_ops_api/v12/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/v12/static_dns.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/static_dns.rst b/docs/source/development/traffic_ops_api/v12/static_dns.rst
index 266dad4..0e44cec 100644
--- a/docs/source/development/traffic_ops_api/v12/static_dns.rst
+++ b/docs/source/development/traffic_ops_api/v12/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/v12/status.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/status.rst b/docs/source/development/traffic_ops_api/v12/status.rst
index e374527..a97a313 100644
--- a/docs/source/development/traffic_ops_api/v12/status.rst
+++ b/docs/source/development/traffic_ops_api/v12/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/v12/system.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/system.rst b/docs/source/development/traffic_ops_api/v12/system.rst
index e2f5fe7..2740d22 100644
--- a/docs/source/development/traffic_ops_api/v12/system.rst
+++ b/docs/source/development/traffic_ops_api/v12/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/v12/to_extension.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/to_extension.rst b/docs/source/development/traffic_ops_api/v12/to_extension.rst
index b4b05f8..44c0246 100644
--- a/docs/source/development/traffic_ops_api/v12/to_extension.rst
+++ b/docs/source/development/traffic_ops_api/v12/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/v12/topology.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/topology.rst b/docs/source/development/traffic_ops_api/v12/topology.rst
index 6c73832..89444f0 100644
--- a/docs/source/development/traffic_ops_api/v12/topology.rst
+++ b/docs/source/development/traffic_ops_api/v12/topology.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/type.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/type.rst b/docs/source/development/traffic_ops_api/v12/type.rst
index 4238fc7..6d614c5 100644
--- a/docs/source/development/traffic_ops_api/v12/type.rst
+++ b/docs/source/development/traffic_ops_api/v12/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/v12/user.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/user.rst b/docs/source/development/traffic_ops_api/v12/user.rst
index e81292a..bbe0278 100644
--- a/docs/source/development/traffic_ops_api/v12/user.rst
+++ b/docs/source/development/traffic_ops_api/v12/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_portal.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_portal.rst b/docs/source/development/traffic_portal.rst
index 691c4b2..7135bc7 100644
--- a/docs/source/development/traffic_portal.rst
+++ b/docs/source/development/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.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/development/traffic_router.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_router.rst b/docs/source/development/traffic_router.rst
index a9baaa3..6df7627 100644
--- a/docs/source/development/traffic_router.rst
+++ b/docs/source/development/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/development/traffic_router/traffic_router_api.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_router/traffic_router_api.rst b/docs/source/development/traffic_router/traffic_router_api.rst
index 00f3e8a..d742276 100644
--- a/docs/source/development/traffic_router/traffic_router_api.rst
+++ b/docs/source/development/traffic_router/traffic_router_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_server.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_server.rst b/docs/source/development/traffic_server.rst
index 25014b3..f8a78fb 100644
--- a/docs/source/development/traffic_server.rst
+++ b/docs/source/development/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/development/traffic_stats.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_stats.rst b/docs/source/development/traffic_stats.rst
index 4c78bec..02317f7 100644
--- a/docs/source/development/traffic_stats.rst
+++ b/docs/source/development/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.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/faq/administration.rst
----------------------------------------------------------------------
diff --git a/docs/source/faq/administration.rst b/docs/source/faq/administration.rst
index a003811..feecff7 100644
--- a/docs/source/faq/administration.rst
+++ b/docs/source/faq/administration.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/faq/development.rst
----------------------------------------------------------------------
diff --git a/docs/source/faq/development.rst b/docs/source/faq/development.rst
index cb62481..8518eeb 100644
--- a/docs/source/faq/development.rst
+++ b/docs/source/faq/development.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.
@@ -19,4 +18,4 @@ Development
How can I become involved?
==========================
- See our `CONTRIBUTING <https://github.com/Comcast/traffic_control/blob/master/CONTRIBUTING.md>`_ page.
\ No newline at end of file
+ See our `CONTRIBUTING <https://github.com/apache/incubator-trafficcontrol/blob/master/CONTRIBUTING.md>`_ page.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/faq/general.rst
----------------------------------------------------------------------
diff --git a/docs/source/faq/general.rst b/docs/source/faq/general.rst
index c2364e2..747aa60 100644
--- a/docs/source/faq/general.rst
+++ b/docs/source/faq/general.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.
@@ -34,7 +33,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 google forum `here <https://groups.google.com/forum/#!forum/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>`_.
What is Rascal?
===============
@@ -50,4 +49,4 @@ What is Twelve Monkeys?
What license is Traffic Control released under?
===============================================
- See the `LICENSE file <https://github.com/Comcast/traffic_control/blob/master/LICENSE>`_
+ See the `LICENSE file <https://github.com/apache/incubator-trafficcontrol/blob/master/LICENSE>`_
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/faq/index.rst
----------------------------------------------------------------------
diff --git a/docs/source/faq/index.rst b/docs/source/faq/index.rst
index c72fbe4..82ea912 100644
--- a/docs/source/faq/index.rst
+++ b/docs/source/faq/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/index.rst
----------------------------------------------------------------------
diff --git a/docs/source/index.rst b/docs/source/index.rst
index 2c49467..2a12096 100644
--- a/docs/source/index.rst
+++ b/docs/source/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/overview/index.rst
----------------------------------------------------------------------
diff --git a/docs/source/overview/index.rst b/docs/source/overview/index.rst
index 095dda0..65dd20e 100644
--- a/docs/source/overview/index.rst
+++ b/docs/source/overview/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/overview/introduction.rst
----------------------------------------------------------------------
diff --git a/docs/source/overview/introduction.rst b/docs/source/overview/introduction.rst
index c379578..a983820 100644
--- a/docs/source/overview/introduction.rst
+++ b/docs/source/overview/introduction.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.
@@ -18,7 +17,7 @@ Introduction
============
Traffic Control is a control plane for a CDN, which includes all of the components mentioned in the CDN Basics section, except for the Log File Analysis System. The caching software chosen for Traffic Control is `Apache Traffic Server <http://trafficserver.apache.org/>`_ (ATS). Although the current release only supports ATS as a cache, this may change with future releases.
-Traffic Control was first developed at Comcast for internal use and released to Open Source in April of 2015.
+Traffic Control was first developed at Comcast for internal use and released to Open Source in April of 2015. Traffic Control moved into the Apache Incubator in August of 2016.
Traffic Control implements the blue boxes in the architecture diagram below.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/overview/traffic_monitor.rst
----------------------------------------------------------------------
diff --git a/docs/source/overview/traffic_monitor.rst b/docs/source/overview/traffic_monitor.rst
index e25fcbc..1a3222f 100644
--- a/docs/source/overview/traffic_monitor.rst
+++ b/docs/source/overview/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/overview/traffic_ops.rst
----------------------------------------------------------------------
diff --git a/docs/source/overview/traffic_ops.rst b/docs/source/overview/traffic_ops.rst
index 59720e2..9cc72ee 100644
--- a/docs/source/overview/traffic_ops.rst
+++ b/docs/source/overview/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.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/overview/traffic_portal.rst
----------------------------------------------------------------------
diff --git a/docs/source/overview/traffic_portal.rst b/docs/source/overview/traffic_portal.rst
index a52ee84..20325e4 100644
--- a/docs/source/overview/traffic_portal.rst
+++ b/docs/source/overview/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.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/overview/traffic_router.rst
----------------------------------------------------------------------
diff --git a/docs/source/overview/traffic_router.rst b/docs/source/overview/traffic_router.rst
index 0f72a50..f9ed1bc 100644
--- a/docs/source/overview/traffic_router.rst
+++ b/docs/source/overview/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/overview/traffic_server.rst
----------------------------------------------------------------------
diff --git a/docs/source/overview/traffic_server.rst b/docs/source/overview/traffic_server.rst
index 8fd0e15..4928e4e 100644
--- a/docs/source/overview/traffic_server.rst
+++ b/docs/source/overview/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/overview/traffic_stats.rst
----------------------------------------------------------------------
diff --git a/docs/source/overview/traffic_stats.rst b/docs/source/overview/traffic_stats.rst
index 874b10d..10981de 100644
--- a/docs/source/overview/traffic_stats.rst
+++ b/docs/source/overview/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.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/docs/source/overview/traffic_vault.rst
----------------------------------------------------------------------
diff --git a/docs/source/overview/traffic_vault.rst b/docs/source/overview/traffic_vault.rst
index 33efdd3..933b86b 100644
--- a/docs/source/overview/traffic_vault.rst
+++ b/docs/source/overview/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.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/docker/build/Dockerfile-traffic_monitor
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/Dockerfile-traffic_monitor b/infrastructure/docker/build/Dockerfile-traffic_monitor
index 286fe8f..cfa86c8 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_monitor
+++ b/infrastructure/docker/build/Dockerfile-traffic_monitor
@@ -1,3 +1,19 @@
+# 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.
FROM centos:7
MAINTAINER Dan Kirkwood
@@ -8,7 +24,7 @@ RUN yum -y install \
rpm-build && \
yum -y clean all
-ENV GITREPO=https://github.com/Comcast/traffic_control
+ENV GITREPO=https://github.com/apache/incubator-trafficcontrol
ENV BRANCH=master
# Above are common for all sub-projects.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/docker/build/Dockerfile-traffic_ops
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/Dockerfile-traffic_ops b/infrastructure/docker/build/Dockerfile-traffic_ops
index 87c6458..24878c7 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_ops
+++ b/infrastructure/docker/build/Dockerfile-traffic_ops
@@ -1,3 +1,19 @@
+# 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.
FROM centos:7
MAINTAINER Dan Kirkwood
@@ -26,7 +42,7 @@ RUN yum install -y \
# all ENV vars can be controlled by, e.g. `docker run -e BRANCH=1.6.x <image>`
-ENV GITREPO=https://github.com/Comcast/traffic_control
+ENV GITREPO=https://github.com/apache/incubator-trafficcontrol
ENV BRANCH=master
WORKDIR /repo
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/docker/build/Dockerfile-traffic_portal
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/Dockerfile-traffic_portal b/infrastructure/docker/build/Dockerfile-traffic_portal
index 5763459..7d535f5 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_portal
+++ b/infrastructure/docker/build/Dockerfile-traffic_portal
@@ -1,3 +1,19 @@
+# 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.
FROM centos:7
MAINTAINER Dan Kirkwood
@@ -8,7 +24,7 @@ RUN yum -y install \
rpm-build && \
yum -y clean all
-ENV GITREPO https://github.com/Comcast/traffic_control
+ENV GITREPO https://github.com/apache/incubator-trafficcontrol
ENV BRANCH master
WORKDIR /repo
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/docker/build/Dockerfile-traffic_router
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/Dockerfile-traffic_router b/infrastructure/docker/build/Dockerfile-traffic_router
index 733c738..e2188f9 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_router
+++ b/infrastructure/docker/build/Dockerfile-traffic_router
@@ -1,3 +1,19 @@
+# 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.
FROM centos:7
MAINTAINER Dan Kirkwood
@@ -8,7 +24,7 @@ RUN yum -y install \
rpm-build && \
yum -y clean all
-ENV GITREPO https://github.com/Comcast/traffic_control
+ENV GITREPO https://github.com/apache/incubator-trafficcontrol
ENV BRANCH master
WORKDIR /repo
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/docker/build/Dockerfile-traffic_stats
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/Dockerfile-traffic_stats b/infrastructure/docker/build/Dockerfile-traffic_stats
index dbf66c8..d669b03 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_stats
+++ b/infrastructure/docker/build/Dockerfile-traffic_stats
@@ -1,3 +1,19 @@
+# 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.
FROM centos:7
MAINTAINER Dan Kirkwood
@@ -8,7 +24,7 @@ RUN yum -y install \
rpm-build && \
yum -y clean all
-ENV GITREPO https://github.com/Comcast/traffic_control
+ENV GITREPO https://github.com/apache/incubator-trafficcontrol
ENV BRANCH master
WORKDIR /repo
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/docker/build/README.md
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/README.md b/infrastructure/docker/build/README.md
index 6e7a7bd..a600340 100644
--- a/infrastructure/docker/build/README.md
+++ b/infrastructure/docker/build/README.md
@@ -1,9 +1,9 @@
-# Building *traffic_control* using *docker-compose*
+# Building *trafficcontrol* using *docker-compose*
- install `docker-engine` and `docker-compose`
-- `cd traffic_control/infrastructure/docker/build`
-- `export GITREPO=https://github.com/<username>/traffic_control`
+- `cd incubator-trafficcontrol/infrastructure/docker/build`
+- `export GITREPO=https://github.com/<username>/incubator-trafficcontrol`
- `export BRANCH=mynewbranch`
- `docker-compose up traffic_monitor_build traffic_ops_build ...`
- new rpm files will be in `./artifacts`
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/docker/build/docker-compose.yml
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/docker-compose.yml b/infrastructure/docker/build/docker-compose.yml
index b219c5f..879446d 100644
--- a/infrastructure/docker/build/docker-compose.yml
+++ b/infrastructure/docker/build/docker-compose.yml
@@ -1,11 +1,27 @@
+# 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.
---
-# Build configuration for traffic_control
+# Build configuration for trafficcontrol
# Usage:
# GITREPO=... BRANCH=... docker-compose up [<service>...]
#
-# where GITREPO is https path to traffic_control clone
-# (default: https://github.com/Comcast/traffic_control)
+# where GITREPO is https path to trafficcontrol clone
+# (default: https://github.com/apache/incubator-trafficcontrol)
# and <branch> is name of branch to test
# (default: master).
#
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/docker/build/run-build.sh
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/run-build.sh b/infrastructure/docker/build/run-build.sh
index cbe00a9..58127d8 100755
--- a/infrastructure/docker/build/run-build.sh
+++ b/infrastructure/docker/build/run-build.sh
@@ -1,20 +1,37 @@
#!/usr/bin/env bash
+# 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.
target=$1
[[ -z $target ]] && echo "No target specified"
echo "Building $target"
-echo "GITREPO=${GITREPO:=https://github.com/Comcast/traffic_control}"
+echo "GITREPO=${GITREPO:=https://github.com/apache/incubator-trafficcontrol}"
echo "BRANCH=${BRANCH:=master}"
+dir=$(basename $GITREPO)
set -x
-git clone $GITREPO -b $BRANCH traffic_control
+git clone "$GITREPO" -b "$BRANCH" $dir || echo "Clone failed: $!"
-cd traffic_control/$target
+cd $dir/$target
./build/build_rpm.sh
mkdir -p /artifacts
cp ../dist/* /artifacts/.
# Clean up for next build
cd -
-rm -r traffic_control
+rm -r $dir
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/docker/traffic_monitor/Dockerfile
----------------------------------------------------------------------
diff --git a/infrastructure/docker/traffic_monitor/Dockerfile b/infrastructure/docker/traffic_monitor/Dockerfile
index 01ef03d..a47227a 100644
--- a/infrastructure/docker/traffic_monitor/Dockerfile
+++ b/infrastructure/docker/traffic_monitor/Dockerfile
@@ -1,3 +1,19 @@
+# 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.
############################################################
# Dockerfile to build Traffic Monitor 1.6.0 container images
# Based on CentOS 6.6
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/docker/traffic_monitor/run.sh
----------------------------------------------------------------------
diff --git a/infrastructure/docker/traffic_monitor/run.sh b/infrastructure/docker/traffic_monitor/run.sh
index d109e44..b6269a9 100755
--- a/infrastructure/docker/traffic_monitor/run.sh
+++ b/infrastructure/docker/traffic_monitor/run.sh
@@ -1,4 +1,20 @@
#!/bin/bash
+# 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.
# Script for running the Dockerfile for Traffic Monitor.
# The Dockerfile sets up a Docker image which can be used for any new container;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/docker/traffic_ops/Dockerfile
----------------------------------------------------------------------
diff --git a/infrastructure/docker/traffic_ops/Dockerfile b/infrastructure/docker/traffic_ops/Dockerfile
index 444c3db..951f0dc 100644
--- a/infrastructure/docker/traffic_ops/Dockerfile
+++ b/infrastructure/docker/traffic_ops/Dockerfile
@@ -1,3 +1,19 @@
+# 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.
############################################################
# Dockerfile to build Traffic Ops 1.6.0 container images
# Based on CentOS 7.2
@@ -5,7 +21,7 @@
# Example Build and Run:
# docker network create cdnet
-# docker build --rm --tag traffic_ops:1.6.0 --build-arg=RPM=http://traffic-control-cdn.net/downloads/1.6.0/RELEASE-1.6.0/traffic_ops-1.6.0-3503.4899d302.x86_64.rpm traffic_ops
+# docker build --rm --tag traffic_ops:1.7.0 --build-arg=RPM=http://traffic-control-cdn.net/downloads/1.7.0/RELEASE-1.7.0/traffic_ops-1.7.0-3908.5b77f60f.x86_64.rpm traffic_ops
#
# docker run --name my-traffic-ops-mysql --hostname my-traffic-ops-mysql --net cdnet --env MYSQL_ROOT_PASSWORD=secretrootpass --detach mysql:5.5
#
@@ -18,7 +34,7 @@ RUN yum install -y perl cpanminus perl-Test-CPAN-Meta
RUN cpanm Carton
# Override RPM arg to use a different one using --build-arg RPM=... Can be local file or http://...
-ARG RPM=TODO
+ARG RPM=http://traffic-control-cdn.net/downloads/1.7.0/RELEASE-1.7.0/traffic_ops-1.7.0-3908.5b77f60f.x86_64.rpm
ADD $RPM /
RUN yum install -y /$(basename $RPM)
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/docker/traffic_ops/run.sh
----------------------------------------------------------------------
diff --git a/infrastructure/docker/traffic_ops/run.sh b/infrastructure/docker/traffic_ops/run.sh
index 3a44c8c..8672494 100755
--- a/infrastructure/docker/traffic_ops/run.sh
+++ b/infrastructure/docker/traffic_ops/run.sh
@@ -1,4 +1,20 @@
#!/bin/bash
+# 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.
# Script for running the Dockerfile for Traffic Ops.
# The Dockerfile sets up a Docker image which can be used for any new Traffic Ops container;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/docker/traffic_router/Dockerfile
----------------------------------------------------------------------
diff --git a/infrastructure/docker/traffic_router/Dockerfile b/infrastructure/docker/traffic_router/Dockerfile
index f8ae335..dc4d0fc 100644
--- a/infrastructure/docker/traffic_router/Dockerfile
+++ b/infrastructure/docker/traffic_router/Dockerfile
@@ -1,3 +1,19 @@
+# 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.
############################################################
# Dockerfile to build Traffic Router 1.4 container images
# Based on CentOS 6.6
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/docker/traffic_router/run.sh
----------------------------------------------------------------------
diff --git a/infrastructure/docker/traffic_router/run.sh b/infrastructure/docker/traffic_router/run.sh
index fcb15fe..9970ebc 100755
--- a/infrastructure/docker/traffic_router/run.sh
+++ b/infrastructure/docker/traffic_router/run.sh
@@ -1,4 +1,20 @@
#!/bin/bash
+# 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.
# Script for running the Dockerfile for Traffic Router.
# The Dockerfile sets up a Docker image which can be used for any new container;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/docker/traffic_server_edge/Dockerfile
----------------------------------------------------------------------
diff --git a/infrastructure/docker/traffic_server_edge/Dockerfile b/infrastructure/docker/traffic_server_edge/Dockerfile
index c379290..4cd059b 100644
--- a/infrastructure/docker/traffic_server_edge/Dockerfile
+++ b/infrastructure/docker/traffic_server_edge/Dockerfile
@@ -1,3 +1,19 @@
+# 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.
############################################################
# Dockerfile to build Traffic Server container images
# as Edges for Traffic Control 1.4
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/docker/traffic_server_edge/run.sh
----------------------------------------------------------------------
diff --git a/infrastructure/docker/traffic_server_edge/run.sh b/infrastructure/docker/traffic_server_edge/run.sh
index 98e45f5..d695973 100755
--- a/infrastructure/docker/traffic_server_edge/run.sh
+++ b/infrastructure/docker/traffic_server_edge/run.sh
@@ -1,4 +1,20 @@
#!/bin/bash
+# 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.
# Script for running the Dockerfile for Traffic Server Edge caches.
# The Dockerfile sets up a Docker image which can be used for any new container;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/docker/traffic_server_mid/Dockerfile
----------------------------------------------------------------------
diff --git a/infrastructure/docker/traffic_server_mid/Dockerfile b/infrastructure/docker/traffic_server_mid/Dockerfile
index b3a7001..33ff0cd 100644
--- a/infrastructure/docker/traffic_server_mid/Dockerfile
+++ b/infrastructure/docker/traffic_server_mid/Dockerfile
@@ -1,3 +1,19 @@
+# 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.
############################################################
# Dockerfile to build Traffic Server container images
# as Mids for Traffic Control 1.4
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/docker/traffic_server_mid/run.sh
----------------------------------------------------------------------
diff --git a/infrastructure/docker/traffic_server_mid/run.sh b/infrastructure/docker/traffic_server_mid/run.sh
index a6617b2..f4f8612 100755
--- a/infrastructure/docker/traffic_server_mid/run.sh
+++ b/infrastructure/docker/traffic_server_mid/run.sh
@@ -1,4 +1,20 @@
#!/bin/bash
+# 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.
# Script for running the Dockerfile for Traffic Server Mid caches.
# The Dockerfile sets up a Docker image which can be used for any new container;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/docker/traffic_stats/Dockerfile
----------------------------------------------------------------------
diff --git a/infrastructure/docker/traffic_stats/Dockerfile b/infrastructure/docker/traffic_stats/Dockerfile
index c363624..6881d07 100644
--- a/infrastructure/docker/traffic_stats/Dockerfile
+++ b/infrastructure/docker/traffic_stats/Dockerfile
@@ -1,3 +1,19 @@
+# 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.
############################################################
# Dockerfile to build Traffic Stats 1.4 container images
# Based on CentOS 6.6
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/docker/traffic_stats/run.sh
----------------------------------------------------------------------
diff --git a/infrastructure/docker/traffic_stats/run.sh b/infrastructure/docker/traffic_stats/run.sh
index 4ca54e5..7f91b64 100755
--- a/infrastructure/docker/traffic_stats/run.sh
+++ b/infrastructure/docker/traffic_stats/run.sh
@@ -1,4 +1,20 @@
#!/bin/bash
+# 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.
# Script for running the Dockerfile for Traffic Stats.
# The Dockerfile sets up a Docker image which can be used for any new container;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/docker/traffic_vault/Dockerfile
----------------------------------------------------------------------
diff --git a/infrastructure/docker/traffic_vault/Dockerfile b/infrastructure/docker/traffic_vault/Dockerfile
index 4e07403..4096336 100644
--- a/infrastructure/docker/traffic_vault/Dockerfile
+++ b/infrastructure/docker/traffic_vault/Dockerfile
@@ -1,3 +1,19 @@
+# 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.
############################################################
# Dockerfile to build Riak container images
# as Traffic Vault for Traffic Control 1.6.0
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/docker/traffic_vault/run.sh
----------------------------------------------------------------------
diff --git a/infrastructure/docker/traffic_vault/run.sh b/infrastructure/docker/traffic_vault/run.sh
index 023169a..a0c7485 100755
--- a/infrastructure/docker/traffic_vault/run.sh
+++ b/infrastructure/docker/traffic_vault/run.sh
@@ -1,4 +1,20 @@
#!/bin/bash
+# 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.
# Script for running the Dockerfile for Traffic Vault.
# The Dockerfile sets up a Docker image which can be used for any new container;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/test/api/traffic_ops/traffic_ops_test.go
----------------------------------------------------------------------
diff --git a/infrastructure/test/api/traffic_ops/traffic_ops_test.go b/infrastructure/test/api/traffic_ops/traffic_ops_test.go
index d79535b..1c3b96b 100644
--- a/infrastructure/test/api/traffic_ops/traffic_ops_test.go
+++ b/infrastructure/test/api/traffic_ops/traffic_ops_test.go
@@ -1,5 +1,25 @@
package main
+/*
+ * 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.
+ */
+
+
import (
"github.com/Comcast/traffic_control/infrastructure/test/apitest"
"strconv"
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/infrastructure/test/api/traffic_ops/traffic_ops_tester.go
----------------------------------------------------------------------
diff --git a/infrastructure/test/api/traffic_ops/traffic_ops_tester.go b/infrastructure/test/api/traffic_ops/traffic_ops_tester.go
index a2d06b3..a9ed5ed 100644
--- a/infrastructure/test/api/traffic_ops/traffic_ops_tester.go
+++ b/infrastructure/test/api/traffic_ops/traffic_ops_tester.go
@@ -1,5 +1,25 @@
package main
+/*
+ * 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.
+ */
+
+
import (
"errors"
"github.com/Comcast/traffic_control/infrastructure/test/apitest"