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 2017/05/22 14:24:56 UTC
[3/5] incubator-trafficcontrol git commit: license fixes to be
backported to 2.0.x
license fixes to be backported to 2.0.x
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/1ddcd734
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/1ddcd734
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/1ddcd734
Branch: refs/heads/master
Commit: 1ddcd73418bf17450a194cd767370c09763ed1fa
Parents: bcad70f
Author: Dan Kirkwood <da...@gmail.com>
Authored: Fri May 19 16:54:39 2017 -0600
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Mon May 22 08:22:32 2017 -0600
----------------------------------------------------------------------
.rat-excludes | 1 +
traffic_monitor_golang/common/util/num.go | 19 +++++++++++++++++++
.../traffic_monitor/crconfig/data.go | 19 +++++++++++++++++++
traffic_ops_db/pg-migration/runwaiter.sh | 16 ++++++++++++++++
4 files changed, 55 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/1ddcd734/.rat-excludes
----------------------------------------------------------------------
diff --git a/.rat-excludes b/.rat-excludes
index 116bf91..630c216 100644
--- a/.rat-excludes
+++ b/.rat-excludes
@@ -5,6 +5,7 @@ VERSION(?: This very short file doesn't support commen
.*\.css\.map(?: debug files for minified css. License borne by source. ){0}
\..*(?: hidden files ought not to be code. These are generally things like projects, ignore files and such. ){0}
LICEN[SC]E.*(?: Licenses do not usually require meta-licenses. ){0}
+^licenses/*(?: Licenses do not usually require meta-licenses. ){0}
.*\.conf(?:ig)?(?:\.?.*)?(?: Config files aren't code and don't typically require licenses. ){0}
.*\.cfg(?: config file ){0}
.*\.logrotate(?: config file ){0}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/1ddcd734/traffic_monitor_golang/common/util/num.go
----------------------------------------------------------------------
diff --git a/traffic_monitor_golang/common/util/num.go b/traffic_monitor_golang/common/util/num.go
index e15a129..7d0406e 100644
--- a/traffic_monitor_golang/common/util/num.go
+++ b/traffic_monitor_golang/common/util/num.go
@@ -1,5 +1,24 @@
package util
+/*
+ * 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.
+ */
+
const MillisecondsPerNanosecond = int64(1000000)
// ToNumeric returns a float for any numeric type, and false if the interface does not hold a numeric type.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/1ddcd734/traffic_monitor_golang/traffic_monitor/crconfig/data.go
----------------------------------------------------------------------
diff --git a/traffic_monitor_golang/traffic_monitor/crconfig/data.go b/traffic_monitor_golang/traffic_monitor/crconfig/data.go
index ff60155..8069146 100644
--- a/traffic_monitor_golang/traffic_monitor/crconfig/data.go
+++ b/traffic_monitor_golang/traffic_monitor/crconfig/data.go
@@ -1,5 +1,24 @@
package crconfig
+/*
+ * 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 (
"time"
)
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/1ddcd734/traffic_ops_db/pg-migration/runwaiter.sh
----------------------------------------------------------------------
diff --git a/traffic_ops_db/pg-migration/runwaiter.sh b/traffic_ops_db/pg-migration/runwaiter.sh
old mode 100755
new mode 100644
index 7cf2222..f5609c9
--- a/traffic_ops_db/pg-migration/runwaiter.sh
+++ b/traffic_ops_db/pg-migration/runwaiter.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.
echo "WAITER_HOST: $WAITER_HOST"