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/16 14:24:29 UTC
[2/3] incubator-quarks git commit: Add ASF license headers and add
reasoning for a line of code
Add ASF license headers and add reasoning for a line of code
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/240b4308
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/240b4308
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/240b4308
Branch: refs/heads/master
Commit: 240b4308a56274ac22ac7c7f046ad4f2a94a29f0
Parents: 399ea8d
Author: Queenie Ma <qu...@gmail.com>
Authored: Tue Mar 15 16:01:39 2016 -0700
Committer: Queenie Ma <qu...@gmail.com>
Committed: Tue Mar 15 16:01:39 2016 -0700
----------------------------------------------------------------------
.../CombiningStreamsProcessingResults.java | 23 +++++++++++++++-----
.../utils/sensor/HeartMonitorSensor.java | 19 +++++++++++++---
2 files changed, 34 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/240b4308/samples/topology/src/main/java/quarks/samples/topology/CombiningStreamsProcessingResults.java
----------------------------------------------------------------------
diff --git a/samples/topology/src/main/java/quarks/samples/topology/CombiningStreamsProcessingResults.java b/samples/topology/src/main/java/quarks/samples/topology/CombiningStreamsProcessingResults.java
index a28965a..6bcebe6 100644
--- a/samples/topology/src/main/java/quarks/samples/topology/CombiningStreamsProcessingResults.java
+++ b/samples/topology/src/main/java/quarks/samples/topology/CombiningStreamsProcessingResults.java
@@ -1,8 +1,21 @@
/*
-# 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.samples.topology;
import java.util.HashSet;
@@ -136,8 +149,8 @@ public class CombiningStreamsProcessingResults {
.modify(tuple -> "Hypertensive Crisis!!!\n" + tuple)
.tag("hypertensive");
- // Union two streams to obtain a single stream containing alerts from the normal and
- // prehypertension alert streams
+ // Additional processing for these streams could go here. In this case, union two streams
+ // to obtain a single stream containing alerts from the normal and prehypertension alert streams.
TStream<String> normalAndPrehypertensionAlerts = normalAlerts.union(prehypertensionAlerts);
// Set of streams containing alerts from the other categories
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/240b4308/samples/utils/src/main/java/quarks/samples/utils/sensor/HeartMonitorSensor.java
----------------------------------------------------------------------
diff --git a/samples/utils/src/main/java/quarks/samples/utils/sensor/HeartMonitorSensor.java b/samples/utils/src/main/java/quarks/samples/utils/sensor/HeartMonitorSensor.java
index 421c3f6..9fa57d6 100644
--- a/samples/utils/src/main/java/quarks/samples/utils/sensor/HeartMonitorSensor.java
+++ b/samples/utils/src/main/java/quarks/samples/utils/sensor/HeartMonitorSensor.java
@@ -1,8 +1,21 @@
/*
-# 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.samples.utils.sensor;
import java.util.HashMap;