You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by dj...@apache.org on 2016/03/22 18:38:55 UTC
[1/2] incubator-quarks git commit: Replace IBM copyright with ASF
licence header in analytic java files
Repository: incubator-quarks
Updated Branches:
refs/heads/master 61ade6a00 -> ffa9018b2
Replace IBM copyright with ASF licence header in analytic java files
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/b3e41a13
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/b3e41a13
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/b3e41a13
Branch: refs/heads/master
Commit: b3e41a13d58091ab7ac98d726daf9181ae573ba5
Parents: c28ad8e
Author: Daniel J. Debrunner <de...@us.ibm.com>
Authored: Tue Mar 22 09:31:51 2016 -0700
Committer: Daniel J. Debrunner <de...@us.ibm.com>
Committed: Tue Mar 22 09:31:51 2016 -0700
----------------------------------------------------------------------
.../analytics/math3/json/JsonAnalytics.java | 18 ++++++++++++++++--
.../math3/json/JsonUnivariateAggregate.java | 18 ++++++++++++++++--
.../math3/json/JsonUnivariateAggregator.java | 18 ++++++++++++++++--
.../quarks/analytics/math3/json/package-info.java | 18 ++++++++++++++++--
.../math3/stat/JsonStorelessStatistic.java | 18 ++++++++++++++++--
.../quarks/analytics/math3/stat/Statistic.java | 18 ++++++++++++++++--
.../quarks/analytics/math3/stat/package-info.java | 18 ++++++++++++++++--
.../test/analytics/math3/StatisticsTest.java | 18 ++++++++++++++++--
.../java/quarks/analytics/sensors/Deadband.java | 18 ++++++++++++++++--
.../java/quarks/analytics/sensors/Filters.java | 18 ++++++++++++++++--
.../quarks/analytics/sensors/package-info.java | 18 ++++++++++++++++--
.../test/analytics/sensors/FiltersTest.java | 18 ++++++++++++++++--
12 files changed, 192 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/b3e41a13/analytics/math3/src/main/java/quarks/analytics/math3/json/JsonAnalytics.java
----------------------------------------------------------------------
diff --git a/analytics/math3/src/main/java/quarks/analytics/math3/json/JsonAnalytics.java b/analytics/math3/src/main/java/quarks/analytics/math3/json/JsonAnalytics.java
index 39be7cd..aafae2b 100644
--- a/analytics/math3/src/main/java/quarks/analytics/math3/json/JsonAnalytics.java
+++ b/analytics/math3/src/main/java/quarks/analytics/math3/json/JsonAnalytics.java
@@ -1,6 +1,20 @@
/*
-# Licensed Materials - Property of IBM
-# Copyright IBM Corp. 2016
+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 quarks.analytics.math3.json;
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/b3e41a13/analytics/math3/src/main/java/quarks/analytics/math3/json/JsonUnivariateAggregate.java
----------------------------------------------------------------------
diff --git a/analytics/math3/src/main/java/quarks/analytics/math3/json/JsonUnivariateAggregate.java b/analytics/math3/src/main/java/quarks/analytics/math3/json/JsonUnivariateAggregate.java
index 93acb0b..9e5aed2 100644
--- a/analytics/math3/src/main/java/quarks/analytics/math3/json/JsonUnivariateAggregate.java
+++ b/analytics/math3/src/main/java/quarks/analytics/math3/json/JsonUnivariateAggregate.java
@@ -1,6 +1,20 @@
/*
-# Licensed Materials - Property of IBM
-# Copyright IBM Corp. 2016
+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 quarks.analytics.math3.json;
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/b3e41a13/analytics/math3/src/main/java/quarks/analytics/math3/json/JsonUnivariateAggregator.java
----------------------------------------------------------------------
diff --git a/analytics/math3/src/main/java/quarks/analytics/math3/json/JsonUnivariateAggregator.java b/analytics/math3/src/main/java/quarks/analytics/math3/json/JsonUnivariateAggregator.java
index 8e5cb7c..4671e0c 100644
--- a/analytics/math3/src/main/java/quarks/analytics/math3/json/JsonUnivariateAggregator.java
+++ b/analytics/math3/src/main/java/quarks/analytics/math3/json/JsonUnivariateAggregator.java
@@ -1,6 +1,20 @@
/*
-# Licensed Materials - Property of IBM
-# Copyright IBM Corp. 2016
+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 quarks.analytics.math3.json;
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/b3e41a13/analytics/math3/src/main/java/quarks/analytics/math3/json/package-info.java
----------------------------------------------------------------------
diff --git a/analytics/math3/src/main/java/quarks/analytics/math3/json/package-info.java b/analytics/math3/src/main/java/quarks/analytics/math3/json/package-info.java
index b4996e4..e1d19ca 100644
--- a/analytics/math3/src/main/java/quarks/analytics/math3/json/package-info.java
+++ b/analytics/math3/src/main/java/quarks/analytics/math3/json/package-info.java
@@ -1,6 +1,20 @@
/*
-# Licensed Materials - Property of IBM
-# Copyright IBM Corp. 2015,2016
+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.
*/
/**
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/b3e41a13/analytics/math3/src/main/java/quarks/analytics/math3/stat/JsonStorelessStatistic.java
----------------------------------------------------------------------
diff --git a/analytics/math3/src/main/java/quarks/analytics/math3/stat/JsonStorelessStatistic.java b/analytics/math3/src/main/java/quarks/analytics/math3/stat/JsonStorelessStatistic.java
index 530d775..4dfe3c8 100644
--- a/analytics/math3/src/main/java/quarks/analytics/math3/stat/JsonStorelessStatistic.java
+++ b/analytics/math3/src/main/java/quarks/analytics/math3/stat/JsonStorelessStatistic.java
@@ -1,6 +1,20 @@
/*
-# Licensed Materials - Property of IBM
-# Copyright IBM Corp. 2016
+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 quarks.analytics.math3.stat;
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/b3e41a13/analytics/math3/src/main/java/quarks/analytics/math3/stat/Statistic.java
----------------------------------------------------------------------
diff --git a/analytics/math3/src/main/java/quarks/analytics/math3/stat/Statistic.java b/analytics/math3/src/main/java/quarks/analytics/math3/stat/Statistic.java
index c8e86f4..6265dd8 100644
--- a/analytics/math3/src/main/java/quarks/analytics/math3/stat/Statistic.java
+++ b/analytics/math3/src/main/java/quarks/analytics/math3/stat/Statistic.java
@@ -1,6 +1,20 @@
/*
-# Licensed Materials - Property of IBM
-# Copyright IBM Corp. 2016
+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 quarks.analytics.math3.stat;
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/b3e41a13/analytics/math3/src/main/java/quarks/analytics/math3/stat/package-info.java
----------------------------------------------------------------------
diff --git a/analytics/math3/src/main/java/quarks/analytics/math3/stat/package-info.java b/analytics/math3/src/main/java/quarks/analytics/math3/stat/package-info.java
index 00da454..12596e9 100644
--- a/analytics/math3/src/main/java/quarks/analytics/math3/stat/package-info.java
+++ b/analytics/math3/src/main/java/quarks/analytics/math3/stat/package-info.java
@@ -1,6 +1,20 @@
/*
-# Licensed Materials - Property of IBM
-# Copyright IBM Corp. 2015,2016
+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.
*/
/**
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/b3e41a13/analytics/math3/src/test/java/quarks/test/analytics/math3/StatisticsTest.java
----------------------------------------------------------------------
diff --git a/analytics/math3/src/test/java/quarks/test/analytics/math3/StatisticsTest.java b/analytics/math3/src/test/java/quarks/test/analytics/math3/StatisticsTest.java
index 363a1e8..5c5ec3d 100644
--- a/analytics/math3/src/test/java/quarks/test/analytics/math3/StatisticsTest.java
+++ b/analytics/math3/src/test/java/quarks/test/analytics/math3/StatisticsTest.java
@@ -1,6 +1,20 @@
/*
-# Licensed Materials - Property of IBM
-# Copyright IBM Corp. 2015,2016
+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 quarks.test.analytics.math3;
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/b3e41a13/analytics/sensors/src/main/java/quarks/analytics/sensors/Deadband.java
----------------------------------------------------------------------
diff --git a/analytics/sensors/src/main/java/quarks/analytics/sensors/Deadband.java b/analytics/sensors/src/main/java/quarks/analytics/sensors/Deadband.java
index 6bf1830..1712aa2 100644
--- a/analytics/sensors/src/main/java/quarks/analytics/sensors/Deadband.java
+++ b/analytics/sensors/src/main/java/quarks/analytics/sensors/Deadband.java
@@ -1,6 +1,20 @@
/*
-# Licensed Materials - Property of IBM
-# Copyright IBM Corp. 2015,2016
+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 quarks.analytics.sensors;
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/b3e41a13/analytics/sensors/src/main/java/quarks/analytics/sensors/Filters.java
----------------------------------------------------------------------
diff --git a/analytics/sensors/src/main/java/quarks/analytics/sensors/Filters.java b/analytics/sensors/src/main/java/quarks/analytics/sensors/Filters.java
index 409f789..885111c 100644
--- a/analytics/sensors/src/main/java/quarks/analytics/sensors/Filters.java
+++ b/analytics/sensors/src/main/java/quarks/analytics/sensors/Filters.java
@@ -1,6 +1,20 @@
/*
-# Licensed Materials - Property of IBM
-# Copyright IBM Corp. 2015,2016
+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 quarks.analytics.sensors;
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/b3e41a13/analytics/sensors/src/main/java/quarks/analytics/sensors/package-info.java
----------------------------------------------------------------------
diff --git a/analytics/sensors/src/main/java/quarks/analytics/sensors/package-info.java b/analytics/sensors/src/main/java/quarks/analytics/sensors/package-info.java
index 869adcc..ccf3738 100644
--- a/analytics/sensors/src/main/java/quarks/analytics/sensors/package-info.java
+++ b/analytics/sensors/src/main/java/quarks/analytics/sensors/package-info.java
@@ -1,6 +1,20 @@
/*
-# Licensed Materials - Property of IBM
-# Copyright IBM Corp. 2016
+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.
*/
/**
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/b3e41a13/analytics/sensors/src/test/java/quarks/test/analytics/sensors/FiltersTest.java
----------------------------------------------------------------------
diff --git a/analytics/sensors/src/test/java/quarks/test/analytics/sensors/FiltersTest.java b/analytics/sensors/src/test/java/quarks/test/analytics/sensors/FiltersTest.java
index 2a37b8b..8583e55 100644
--- a/analytics/sensors/src/test/java/quarks/test/analytics/sensors/FiltersTest.java
+++ b/analytics/sensors/src/test/java/quarks/test/analytics/sensors/FiltersTest.java
@@ -1,6 +1,20 @@
/*
-# Licensed Materials - Property of IBM
-# Copyright IBM Corp. 2016
+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 quarks.test.analytics.sensors;
[2/2] incubator-quarks git commit: Merge branch 'pr-35'
Posted by dj...@apache.org.
Merge branch 'pr-35'
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/ffa9018b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/ffa9018b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/ffa9018b
Branch: refs/heads/master
Commit: ffa9018b2593179c4dea2f1bebff928609647279
Parents: 61ade6a b3e41a1
Author: Daniel J. Debrunner <de...@us.ibm.com>
Authored: Tue Mar 22 10:38:37 2016 -0700
Committer: Daniel J. Debrunner <de...@us.ibm.com>
Committed: Tue Mar 22 10:38:37 2016 -0700
----------------------------------------------------------------------
.../analytics/math3/json/JsonAnalytics.java | 18 ++++++++++++++++--
.../math3/json/JsonUnivariateAggregate.java | 18 ++++++++++++++++--
.../math3/json/JsonUnivariateAggregator.java | 18 ++++++++++++++++--
.../quarks/analytics/math3/json/package-info.java | 18 ++++++++++++++++--
.../math3/stat/JsonStorelessStatistic.java | 18 ++++++++++++++++--
.../quarks/analytics/math3/stat/Statistic.java | 18 ++++++++++++++++--
.../quarks/analytics/math3/stat/package-info.java | 18 ++++++++++++++++--
.../test/analytics/math3/StatisticsTest.java | 18 ++++++++++++++++--
.../java/quarks/analytics/sensors/Deadband.java | 18 ++++++++++++++++--
.../java/quarks/analytics/sensors/Filters.java | 18 ++++++++++++++++--
.../quarks/analytics/sensors/package-info.java | 18 ++++++++++++++++--
.../test/analytics/sensors/FiltersTest.java | 18 ++++++++++++++++--
12 files changed, 192 insertions(+), 24 deletions(-)
----------------------------------------------------------------------