You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@trafficcontrol.apache.org by GitBox <gi...@apache.org> on 2018/02/14 17:46:12 UTC
[GitHub] rob05c closed pull request #1882: 2.2.x license headers, missing license file libraries
rob05c closed pull request #1882: 2.2.x license headers, missing license file libraries
URL: https://github.com/apache/incubator-trafficcontrol/pull/1882
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/LICENSE b/LICENSE
index a2c05de38d..6079c0c814 100644
--- a/LICENSE
+++ b/LICENSE
@@ -336,6 +336,7 @@ For the errors component:
For the x/net component:
@traffic_stats/vendor/golang.org/x/net/*
+@traffic_ops/testing/compare/vendor/golang.org/x/net/*
./traffic_stats/vendor/golang.org/x/net/LICENSE
./traffic_stats/vendor/golang.org/x/net/PATENTS
@@ -419,6 +420,7 @@ The x/net library is used under the BSD License from the Go Authors:
The envconfig component is used under the MIT license:
@traffic_ops/testing/api/vendor/github.com/kelseyhightower/envconfig/*
+@traffic_ops/testing/compare/vendor/github.com/kelseyhightower/envconfig/*
./traffic_ops/testing/api/vendor/github.com/kelseyhightower/envconfig/LICENSE
The govalidator component is used under the MIT license:
diff --git a/traffic_monitor/cache/stats_type_astats.go b/traffic_monitor/cache/stats_type_astats.go
index 98b7919d49..7b19ddd21e 100644
--- a/traffic_monitor/cache/stats_type_astats.go
+++ b/traffic_monitor/cache/stats_type_astats.go
@@ -1,5 +1,24 @@
package cache
+/*
+ * 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.
+ */
+
// stats_type_astats is the default Stats format for Traffic Control.
// It is the Stats format produced by the `astats` plugin to Apache Traffic Server, included with Traffic Control.
//
diff --git a/traffic_monitor/cache/stats_type_astats_dsnames.go b/traffic_monitor/cache/stats_type_astats_dsnames.go
index 88d2a67367..eaa3472d9a 100644
--- a/traffic_monitor/cache/stats_type_astats_dsnames.go
+++ b/traffic_monitor/cache/stats_type_astats_dsnames.go
@@ -1,21 +1,40 @@
package cache
+/*
+ * 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.
+ */
+
// stats_type_astats_dsnames is a Stat format similar to the default Astats, but with Fully Qualified Domain Names replaced with Delivery Service names (xml_id)
// That is, stat names are of the form: `"plugin.remap_stats.delivery-service-name.stat-name"`
-import(
+import (
+ "fmt"
"strconv"
"strings"
- "fmt"
- "github.com/apache/incubator-trafficcontrol/lib/go-tc"
"github.com/apache/incubator-trafficcontrol/lib/go-log"
+ "github.com/apache/incubator-trafficcontrol/lib/go-tc"
"github.com/apache/incubator-trafficcontrol/traffic_monitor/dsdata"
"github.com/apache/incubator-trafficcontrol/traffic_monitor/todata"
)
func init() {
- AddStatsType("astats-dsnames", astatsParse, astatsdsnamesPrecompute)
+ AddStatsType("astats-dsnames", astatsParse, astatsdsnamesPrecompute)
}
func astatsdsnamesPrecompute(cache tc.CacheName, toData todata.TOData, rawStats map[string]interface{}, system AstatsSystem) PrecomputedData {
diff --git a/traffic_monitor/cache/stats_types.go b/traffic_monitor/cache/stats_types.go
index ee18623cbd..25278f5d51 100644
--- a/traffic_monitor/cache/stats_types.go
+++ b/traffic_monitor/cache/stats_types.go
@@ -1,5 +1,24 @@
package cache
+/*
+ * 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 (
"io"
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services