[TC-9] Update DISCLAIMER, NOTICE, CONTRIBUTING.md. Moved Cisco copyrights to NOTICE.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/e11cbd3e Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/e11cbd3e Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/e11cbd3e Branch: refs/heads/master Commit: e11cbd3e8ab031214e217a4330a79819b2f868d6 Parents: 036195d Author: Eric Friedrich <efrie...@cisco.com> Authored: Wed Oct 26 16:08:15 2016 -0700 Committer: Jeremy Mitchell <mitchell...@gmail.com> Committed: Fri Oct 28 15:04:12 2016 -0600 ---------------------------------------------------------------------- CONTRIBUTING.md | 10 +++++----- DISCLAIMER | 1 + NOTICE | 13 ++++++++++--- docs/source/admin/quick_howto/regionalgeo.rst | 1 - .../development/traffic_ops_api/v12/division.rst | 1 - .../20160202000000_add_regional_geo_blocking.sql | 2 -- .../20160630000000_add_multisite_algrithom.sql | 1 - .../migrations/20160630010009_add_secure_parameter.sql | 1 - .../20160729000000_add_geolimit_redirect_url.sql | 1 - traffic_ops/app/lib/API/Topology.pm | 1 - .../traffic_router/core/loc/RegionalGeo.java | 1 - .../traffic_router/core/loc/RegionalGeoDsvc.java | 1 - .../traffic_router/core/loc/RegionalGeoResult.java | 1 - .../traffic_router/core/loc/RegionalGeoRule.java | 1 - .../traffic_router/core/loc/RegionalGeoUpdater.java | 1 - .../traffic_router/core/loc/RegionalGeoRuleTest.java | 1 - .../traffic_router/core/loc/RegionalGeoTest.java | 1 - 17 files changed, 16 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/e11cbd3e/CONTRIBUTING.md ---------------------------------------------------------------------- diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6e6addf..642784c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,13 +3,13 @@ How To Contribute We love pull requests! We simply don't have the time or resources to add every feature and support every platform. If you have improvements for Traffic Control, we're more than happy to merge them in. -We have a few [guidelines](https://github.com/Comcast/traffic_control/blob/master/CONTRIBUTING.md#guidelines) to help maintain code quality and ensure the pull request process goes smoothly. +We have a few [guidelines](https://github.com/apache/incubator-trafficcontrol/blob/master/CONTRIBUTING.md#guidelines) to help maintain code quality and ensure the pull request process goes smoothly. Remember, it doesn't have to be perfect. If you want to help, hack it together and submit a [pull request](https://help.github.com/articles/using-pull-requests/). We'll work with you to make sure it fits properly into the project. -Contributor License Agreement +CONTRIBUTORS.md ----------------------------- -First things first, we need you to sign the [Contributor License Agreement (CLA)](http://traffic-control-cdn.net/ComcastContributorLicenseAgreement_03-07-14.pdf) before we can accept your code. This protects us, you, and everyone else using and contributing to Traffic Control. Once you have signed the CLA and had your first pull request merged, your name will be added to the [list of contributors](https://github.com/Comcast/traffic_control/blob/master/CONTRIBUTORS.md). +Please take the opportunity of submitting your first PR to additionally include your name in CONTRIBUTORS.md Making a pull request --------------------- @@ -21,9 +21,9 @@ Following the project conventions will make the pull request process go faster a #### Create an issue -If you want to add a new feature, make a [Github issue](https://github.com/Comcast/traffic_control/issues) and discuss it with us first at [Traffic Control Google Group](https://groups.google.com/forum/#!forum/traffic_control-discuss). We might already be working on it, or there might be an existing way to do it. +If you want to add a new feature, make a [JIRA issue](https://issues.apache.org/jira/browse/TC) and discuss it with us first on the [us...@trafficcontrol.incubator.apache.org](mailto:us...@trafficcontrol.incubator.apache.org) mailing list. We might already be working on it, or there might be an existing way to do it. -If it's a bug fix, we need to know what the problem is and how to reproduce it so please create a [Github issue](https://github.com/Comcast/traffic_control/issues) for that as well. +If it's a bug fix, we need to know what the problem is and how to reproduce it so please create a [JIRA issue](https://issues.apache.org/jira/browse/TC) for that as well. #### Documentation http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/e11cbd3e/DISCLAIMER ---------------------------------------------------------------------- diff --git a/DISCLAIMER b/DISCLAIMER new file mode 100644 index 0000000..0c91830 --- /dev/null +++ b/DISCLAIMER @@ -0,0 +1 @@ +Apache Traffic Control is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF. http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/e11cbd3e/NOTICE ---------------------------------------------------------------------- diff --git a/NOTICE b/NOTICE index f286598..607f549 100644 --- a/NOTICE +++ b/NOTICE @@ -1,4 +1,11 @@ -Traffic Control -Copyright 2012-2015 Comcast Cable Communications Management, LLC +Apache Traffic Control (incubating) +Copyright 2016 The Apache Software Foundation -This product includes software developed at Comcast (http://www.comcast.com/). +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +Portions of this software were developed at +Comcast (http://www.comcast.com/). + +Portions of this software were developed at +Cisco Systems, Inc. (http://www.cisco.com) http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/e11cbd3e/docs/source/admin/quick_howto/regionalgeo.rst ---------------------------------------------------------------------- diff --git a/docs/source/admin/quick_howto/regionalgeo.rst b/docs/source/admin/quick_howto/regionalgeo.rst index 58f8851..a903c8a 100644 --- a/docs/source/admin/quick_howto/regionalgeo.rst +++ b/docs/source/admin/quick_howto/regionalgeo.rst @@ -1,5 +1,4 @@ .. -.. Copyright 2015 Cisco Systems, Inc. .. .. 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/e11cbd3e/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/e11cbd3e/traffic_ops/app/db/migrations/20160202000000_add_regional_geo_blocking.sql ---------------------------------------------------------------------- diff --git a/traffic_ops/app/db/migrations/20160202000000_add_regional_geo_blocking.sql b/traffic_ops/app/db/migrations/20160202000000_add_regional_geo_blocking.sql index b5d58fd..b929945 100644 --- a/traffic_ops/app/db/migrations/20160202000000_add_regional_geo_blocking.sql +++ b/traffic_ops/app/db/migrations/20160202000000_add_regional_geo_blocking.sql @@ -1,6 +1,4 @@ /* - Copyright 2015 Cisco Systems, Inc. - Licensed 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://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/e11cbd3e/traffic_ops/app/db/migrations/20160630000000_add_multisite_algrithom.sql ---------------------------------------------------------------------- diff --git a/traffic_ops/app/db/migrations/20160630000000_add_multisite_algrithom.sql b/traffic_ops/app/db/migrations/20160630000000_add_multisite_algrithom.sql index dfaff38..b7a1a04 100644 --- a/traffic_ops/app/db/migrations/20160630000000_add_multisite_algrithom.sql +++ b/traffic_ops/app/db/migrations/20160630000000_add_multisite_algrithom.sql @@ -1,5 +1,4 @@ /* - Copyright 2016 Cisco Systems, Inc. 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/e11cbd3e/traffic_ops/app/db/migrations/20160630010009_add_secure_parameter.sql ---------------------------------------------------------------------- diff --git a/traffic_ops/app/db/migrations/20160630010009_add_secure_parameter.sql b/traffic_ops/app/db/migrations/20160630010009_add_secure_parameter.sql index 17a0545..eacc13b 100644 --- a/traffic_ops/app/db/migrations/20160630010009_add_secure_parameter.sql +++ b/traffic_ops/app/db/migrations/20160630010009_add_secure_parameter.sql @@ -1,5 +1,4 @@ /* - Copyright 2015 Cisco Systems, Inc. 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/e11cbd3e/traffic_ops/app/db/migrations/20160729000000_add_geolimit_redirect_url.sql ---------------------------------------------------------------------- diff --git a/traffic_ops/app/db/migrations/20160729000000_add_geolimit_redirect_url.sql b/traffic_ops/app/db/migrations/20160729000000_add_geolimit_redirect_url.sql index eea27cd..959362b 100644 --- a/traffic_ops/app/db/migrations/20160729000000_add_geolimit_redirect_url.sql +++ b/traffic_ops/app/db/migrations/20160729000000_add_geolimit_redirect_url.sql @@ -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/e11cbd3e/traffic_ops/app/lib/API/Topology.pm ---------------------------------------------------------------------- diff --git a/traffic_ops/app/lib/API/Topology.pm b/traffic_ops/app/lib/API/Topology.pm index f07e875..fa4dcb7 100644 --- a/traffic_ops/app/lib/API/Topology.pm +++ b/traffic_ops/app/lib/API/Topology.pm @@ -1,6 +1,5 @@ package API::Topology; # -## Copyright 2016 Cisco, 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/e11cbd3e/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeo.java ---------------------------------------------------------------------- diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeo.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeo.java index 92235d0..26a8a96 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeo.java +++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeo.java @@ -1,5 +1,4 @@ /* - * Copyright 2015 Cisco Systems, Inc. * * 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/e11cbd3e/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoDsvc.java ---------------------------------------------------------------------- diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoDsvc.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoDsvc.java index 7a2fabf..9f9d7d1 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoDsvc.java +++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoDsvc.java @@ -1,5 +1,4 @@ /* - * Copyright 2015 Cisco Systems, Inc. * * 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/e11cbd3e/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoResult.java ---------------------------------------------------------------------- diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoResult.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoResult.java index 5ae9b2f..c9d9de5 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoResult.java +++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoResult.java @@ -1,5 +1,4 @@ /* - * Copyright 2015 Cisco Systems, Inc. * * 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/e11cbd3e/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoRule.java ---------------------------------------------------------------------- diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoRule.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoRule.java index 52b1ea3..0b5b749 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoRule.java +++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoRule.java @@ -1,5 +1,4 @@ /* - * Copyright 2015 Cisco Systems, Inc. * * 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/e11cbd3e/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoUpdater.java ---------------------------------------------------------------------- diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoUpdater.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoUpdater.java index 2fb0261..4d8ce36 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoUpdater.java +++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoUpdater.java @@ -1,5 +1,4 @@ /* - * Copyright 2015 Cisco Systems, Inc. * * 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/e11cbd3e/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoRuleTest.java ---------------------------------------------------------------------- diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoRuleTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoRuleTest.java index 09c0c46..2be1a8f 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoRuleTest.java +++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoRuleTest.java @@ -1,5 +1,4 @@ /* - * Copyright 2015 Cisco Systems, Inc. * * 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/e11cbd3e/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoTest.java ---------------------------------------------------------------------- diff --git a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoTest.java b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoTest.java index eede364..900fd1c 100644 --- a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoTest.java +++ b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/RegionalGeoTest.java @@ -1,5 +1,4 @@ /* - * Copyright 2015 Cisco Systems, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.
