You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by el...@apache.org on 2019/01/03 16:03:04 UTC
[trafficcontrol] branch master updated (a37f600 -> 33224f4)
This is an automated email from the ASF dual-hosted git repository.
elsloo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git.
from a37f600 Fixed old path spec in the egg section of remote pip installation instructions (#3176)
new 31d5dc5 update copyright year in NOTICE
new 33224f4 fix copyright issues
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
NOTICE | 2 +-
infrastructure/cdn-in-a-box/ort/setup.py | 12 +++++-------
traffic_ops/testing/api/config/config.go | 31 +++++++++++++++++--------------
traffic_ops/testing/api/log/log.go | 32 +++++++++++++++++---------------
traffic_ops/testing/api/test/http.go | 31 +++++++++++++++++--------------
traffic_ops/testing/api/v14/fixtures.go | 31 +++++++++++++++++--------------
6 files changed, 74 insertions(+), 65 deletions(-)
[trafficcontrol] 01/02: update copyright year in NOTICE
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elsloo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
commit 31d5dc5e714d06e44805bba3f8f6076eff9436c0
Author: Dan Kirkwood <da...@apache.org>
AuthorDate: Thu Jan 3 08:30:48 2019 -0700
update copyright year in NOTICE
---
NOTICE | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/NOTICE b/NOTICE
index 15efcb7..7f1f7b4 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache Traffic Control
-Copyright 2016-2018 The Apache Software Foundation
+Copyright 2016-2019 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
[trafficcontrol] 02/02: fix copyright issues
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elsloo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
commit 33224f4b99487e494d366fe7e477814fbfd9a772
Author: Dan Kirkwood <da...@apache.org>
AuthorDate: Thu Jan 3 08:42:14 2019 -0700
fix copyright issues
---
infrastructure/cdn-in-a-box/ort/setup.py | 12 +++++-------
traffic_ops/testing/api/config/config.go | 31 +++++++++++++++++--------------
traffic_ops/testing/api/log/log.go | 32 +++++++++++++++++---------------
traffic_ops/testing/api/test/http.go | 31 +++++++++++++++++--------------
traffic_ops/testing/api/v14/fixtures.go | 31 +++++++++++++++++--------------
5 files changed, 73 insertions(+), 64 deletions(-)
diff --git a/infrastructure/cdn-in-a-box/ort/setup.py b/infrastructure/cdn-in-a-box/ort/setup.py
index 3589889..96b513c 100755
--- a/infrastructure/cdn-in-a-box/ort/setup.py
+++ b/infrastructure/cdn-in-a-box/ort/setup.py
@@ -1,19 +1,17 @@
#!/usr/bin/env python3
-
-# Copyright 2018 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.
# You may obtain a copy of the License at
-
-# http://www.apache.org/licenses/LICENSE-2.0
-
+#
+# 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.
-
+#
"""
The setuptools-based install script for Traffic Ops ORT
diff --git a/traffic_ops/testing/api/config/config.go b/traffic_ops/testing/api/config/config.go
index e528162..957cd20 100644
--- a/traffic_ops/testing/api/config/config.go
+++ b/traffic_ops/testing/api/config/config.go
@@ -1,18 +1,21 @@
/*
- 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.
- 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.
-*/
+ * 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.
+ */
package config
diff --git a/traffic_ops/testing/api/log/log.go b/traffic_ops/testing/api/log/log.go
index 649b0dc..7e14dcc 100644
--- a/traffic_ops/testing/api/log/log.go
+++ b/traffic_ops/testing/api/log/log.go
@@ -1,18 +1,21 @@
/*
- 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.
- 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.
-*/
+ * 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.
+ */
package log
@@ -51,4 +54,3 @@ func Success(t *testing.T, msg string, args ...interface{}) {
m := fmt.Sprintf(msg, args...)
t.Log(fmt.Sprintf("\t %-80s", m), Succeed)
}
-
diff --git a/traffic_ops/testing/api/test/http.go b/traffic_ops/testing/api/test/http.go
index d74a56c..a5af63d 100644
--- a/traffic_ops/testing/api/test/http.go
+++ b/traffic_ops/testing/api/test/http.go
@@ -1,18 +1,21 @@
/*
- 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.
- 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.
-*/
+ * 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.
+ */
package test
diff --git a/traffic_ops/testing/api/v14/fixtures.go b/traffic_ops/testing/api/v14/fixtures.go
index f9923c2..c1a99a8 100644
--- a/traffic_ops/testing/api/v14/fixtures.go
+++ b/traffic_ops/testing/api/v14/fixtures.go
@@ -1,18 +1,21 @@
/*
- 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.
- 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.
-*/
+ * 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.
+ */
package v14