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 2016/11/07 19:25:07 UTC
[1/2] incubator-trafficcontrol git commit: TM - remove ASF header
from json files
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/master e011a3438 -> 31a17aa5d
TM - remove ASF header from json files
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/e2c5f077
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/e2c5f077
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/e2c5f077
Branch: refs/heads/master
Commit: e2c5f077a15aa2d9217ee934c4415824a55fec5d
Parents: e011a34
Author: Trevor Ackerman <tr...@gmail.com>
Authored: Mon Nov 7 10:53:42 2016 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Mon Nov 7 12:24:26 2016 -0700
----------------------------------------------------------------------
.../src/main/conf/traffic_monitor_config.js | 19 -------------------
.../resources/conf/traffic_monitor_config.js | 19 -------------------
2 files changed, 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/e2c5f077/traffic_monitor/src/main/conf/traffic_monitor_config.js
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/main/conf/traffic_monitor_config.js b/traffic_monitor/src/main/conf/traffic_monitor_config.js
index b050aca..0fa20af 100644
--- a/traffic_monitor/src/main/conf/traffic_monitor_config.js
+++ b/traffic_monitor/src/main/conf/traffic_monitor_config.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.
- */
-
{
"traffic_monitor_config": {
"health.polling.interval": "5000",
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/e2c5f077/traffic_monitor/src/test/resources/conf/traffic_monitor_config.js
----------------------------------------------------------------------
diff --git a/traffic_monitor/src/test/resources/conf/traffic_monitor_config.js b/traffic_monitor/src/test/resources/conf/traffic_monitor_config.js
index 57eef68..3756b33 100644
--- a/traffic_monitor/src/test/resources/conf/traffic_monitor_config.js
+++ b/traffic_monitor/src/test/resources/conf/traffic_monitor_config.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.
- */
-
{"traffic_monitor_config": {
"tm.healthParams.polling.url": "https://${tmHostname}/health/${cdnName}",
"hack.ttl": "30",
[2/2] incubator-trafficcontrol git commit: This closes #54.
Posted by da...@apache.org.
This closes #54.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/31a17aa5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/31a17aa5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/31a17aa5
Branch: refs/heads/master
Commit: 31a17aa5d3b93f3d0291a5397aba2e7b598bca9a
Parents: e2c5f07
Author: Dan Kirkwood <da...@gmail.com>
Authored: Mon Nov 7 12:24:39 2016 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Mon Nov 7 12:24:39 2016 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------