You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by da...@apache.org on 2017/01/24 22:52:36 UTC
[1/4] incubator-trafficcontrol git commit: Removed Apache header from
files to which it does not belong.
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/1.8.x 338d0c0d1 -> 346a61c61
Removed Apache header from files to which it does not belong.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/dad02815
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/dad02815
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/dad02815
Branch: refs/heads/1.8.x
Commit: dad028158f5c74e87ba1cf6bf8a40661369f554d
Parents: 44661df
Author: Chris Lemmons <al...@gmail.com>
Authored: Tue Jan 24 15:44:06 2017 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Tue Jan 24 15:52:05 2017 -0700
----------------------------------------------------------------------
.../experimental/traffic_monitor/sorttable.js | 19 -------------------
.../app/public/css/jquery-ui.structure.css | 19 -------------------
traffic_ops/app/public/css/jquery.tree.min.css | 19 -------------------
traffic_ops/app/public/js/jquery.dataTables.js | 19 -------------------
traffic_ops/app/public/js/jquery.tree.min.js | 19 -------------------
traffic_ops/app/public/js/prettyprint.js | 19 -------------------
6 files changed, 114 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/dad02815/traffic_monitor/experimental/traffic_monitor/sorttable.js
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/traffic_monitor/sorttable.js b/traffic_monitor/experimental/traffic_monitor/sorttable.js
index a3ddc0f..16833a7 100644
--- a/traffic_monitor/experimental/traffic_monitor/sorttable.js
+++ b/traffic_monitor/experimental/traffic_monitor/sorttable.js
@@ -1,23 +1,4 @@
/*
- * 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.
- */
-
-/*
SortTable
version 2
7th April 2007
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/dad02815/traffic_ops/app/public/css/jquery-ui.structure.css
----------------------------------------------------------------------
diff --git a/traffic_ops/app/public/css/jquery-ui.structure.css b/traffic_ops/app/public/css/jquery-ui.structure.css
index c0249d2..d3d88d4 100644
--- a/traffic_ops/app/public/css/jquery-ui.structure.css
+++ b/traffic_ops/app/public/css/jquery-ui.structure.css
@@ -1,22 +1,3 @@
-/*
- * 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.
- */
-
/*!
* jQuery UI CSS Framework 1.11.2
* http://jqueryui.com
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/dad02815/traffic_ops/app/public/css/jquery.tree.min.css
----------------------------------------------------------------------
diff --git a/traffic_ops/app/public/css/jquery.tree.min.css b/traffic_ops/app/public/css/jquery.tree.min.css
index b636813..db1d6d9 100644
--- a/traffic_ops/app/public/css/jquery.tree.min.css
+++ b/traffic_ops/app/public/css/jquery.tree.min.css
@@ -1,20 +1 @@
-/*
- * 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.
- */
-
.daredevel-tree li{list-style-type:none;position:relative}.daredevel-tree li span.daredevel-tree-label{cursor:default;z-index:1}.daredevel-tree li span.daredevel-tree-anchor{cursor:default;position:absolute;top:1px;left:-16px}.daredevel-tree li span.prepended{position:absolute;left:0;top:-5px;z-index:2;visibility:hidden;height:10px;width:100px;overflow:hidden;background-image:url("/images/anchor.gif")}.daredevel-tree li span.prepended.over{visibility:visible}.daredevel-tree li span.droppable-label{position:absolute;left:0;top:5px;z-index:2;visibility:hidden;height:8px;width:100px;overflow:hidden;border:solid 1px}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/dad02815/traffic_ops/app/public/js/jquery.dataTables.js
----------------------------------------------------------------------
diff --git a/traffic_ops/app/public/js/jquery.dataTables.js b/traffic_ops/app/public/js/jquery.dataTables.js
index 0c21aa1..9f068a8 100644
--- a/traffic_ops/app/public/js/jquery.dataTables.js
+++ b/traffic_ops/app/public/js/jquery.dataTables.js
@@ -1,22 +1,3 @@
-/*
- * 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.
- */
-
/*! DataTables 1.10.4
* �2008-2014 SpryMedia Ltd - datatables.net/license
*/
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/dad02815/traffic_ops/app/public/js/jquery.tree.min.js
----------------------------------------------------------------------
diff --git a/traffic_ops/app/public/js/jquery.tree.min.js b/traffic_ops/app/public/js/jquery.tree.min.js
index 02fab26..e719a1a 100644
--- a/traffic_ops/app/public/js/jquery.tree.min.js
+++ b/traffic_ops/app/public/js/jquery.tree.min.js
@@ -1,23 +1,4 @@
/*
- * 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.
- */
-
-/*
* Tree - jQuery Tree Widget
* @author Valerio Galano <v....@daredevel.com>
* @license MIT
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/dad02815/traffic_ops/app/public/js/prettyprint.js
----------------------------------------------------------------------
diff --git a/traffic_ops/app/public/js/prettyprint.js b/traffic_ops/app/public/js/prettyprint.js
index 6d5b8c1..38e2b67 100644
--- a/traffic_ops/app/public/js/prettyprint.js
+++ b/traffic_ops/app/public/js/prettyprint.js
@@ -1,23 +1,4 @@
/*
- * 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.
- */
-
-/*
Copyright (c) 2009 James Padolsey. All rights reserved.
Redistribution and use in source and binary forms, with or without
[3/4] incubator-trafficcontrol git commit: Removed licenses that are
not shipped with 1.8.
Posted by da...@apache.org.
Removed licenses that are not shipped with 1.8.
These were inadvertently added when cherry-picking fixes from master.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/2a6b29ee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/2a6b29ee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/2a6b29ee
Branch: refs/heads/1.8.x
Commit: 2a6b29eecd3a6e26ea17b3b4af6c1917f65cc10e
Parents: 338d0c0
Author: Chris Lemmons <al...@gmail.com>
Authored: Tue Jan 24 15:28:39 2017 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Tue Jan 24 15:52:05 2017 -0700
----------------------------------------------------------------------
LICENSE | 23 +----------------------
1 file changed, 1 insertion(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/2a6b29ee/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 3b64b2a..10048a3 100644
--- a/LICENSE
+++ b/LICENSE
@@ -252,7 +252,7 @@ For the bootstrap component:
/*! normalize.css v3.0.1 | MIT License | git.io/normalize */
For the sorttable component:
-@traffic_monitor/experimental/traffic_monitor/static/sorttable.js
+@traffic_monitor/experimental/traffic_monitor/sorttable.js
/*
SortTable
@@ -431,27 +431,6 @@ Portions Copyright (C) 2011 Blake Mizerany
./traffic_ops/experimental/traffic_ops_auth/vendor/github.com/lib/pq/LICENSE.md
-For the influxdb component:
-@traffic_stats/vendor/github.com/influxdata/influxdb/*
-
-./traffic_stats/vendor/github.com/influxdata/influxdb/LICENSE
-./traffic_stats/vendor/github.com/influxdata/influxdb/LICENSE_OF_DEPENDENCIES.md
-
-For the errors component:
-@traffic_stats/vendor/github.com/pkg/errors/*
-
-./traffic_stats/vendor/github.com/pkg/errors/LICENSE
-
-For the x/net component:
-@traffic_stats/vendor/golang.org/x/net/*
-
-./traffic_stats/vendor/golang.org/x/net/LICENSE
-
-For the errgo component:
-@traffic_stats/vendor/gopkg.in/errgo.v1/*
-
-./traffic_stats/vendor/gopkg.in/errgo.v1/LICENSE
-
For the MaxMind DB GeoLite2 Database:
@traffic_router/core/src/test/resources/geo/GeoLite2-City.mmdb.gz
[4/4] incubator-trafficcontrol git commit: This closes #224.
Posted by da...@apache.org.
This closes #224.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/346a61c6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/346a61c6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/346a61c6
Branch: refs/heads/1.8.x
Commit: 346a61c61aa0bee1b3b5849267d9e3c6c88ce901
Parents: dad0281
Author: Dan Kirkwood <da...@gmail.com>
Authored: Tue Jan 24 15:52:37 2017 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Tue Jan 24 15:52:37 2017 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/4] incubator-trafficcontrol git commit: Removed a file that merely
uses jmenu from the list of jmenu-licensed things.
Posted by da...@apache.org.
Removed a file that merely uses jmenu from the list of jmenu-licensed things.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/44661dfb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/44661dfb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/44661dfb
Branch: refs/heads/1.8.x
Commit: 44661dfb80276498ac03448215d201e387b19bd6
Parents: 2a6b29e
Author: Chris Lemmons <al...@gmail.com>
Authored: Tue Jan 24 15:37:39 2017 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Tue Jan 24 15:52:05 2017 -0700
----------------------------------------------------------------------
LICENSE | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/44661dfb/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 10048a3..afe013f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -296,7 +296,6 @@ http://jquery.org/license
For the jMenu component:
@traffic_ops/app/public/*/jMenu.*
@traffic_ops/app/public/*/jmenu.*
-@traffic_ops/app/templates/jmenu.html.ep
/************************************************************************
*************************************************************************