[1/2] storm git commit: Minor grammar fix to FAQ

2015-10-22 Thread knusbaum
Repository: storm
Updated Branches:
  refs/heads/master b0f3be0a5 -> d72e277ee


Minor grammar fix to FAQ

Missing subject.


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/8ae6b574
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8ae6b574
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8ae6b574

Branch: refs/heads/master
Commit: 8ae6b574a3fe41eae5afbc20ccff23a53bc11aee
Parents: f75fdde
Author: Edward Samson 
Authored: Wed Oct 21 09:54:31 2015 +0800
Committer: Edward Samson 
Committed: Wed Oct 21 09:54:31 2015 +0800

--
 docs/documentation/FAQ.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/8ae6b574/docs/documentation/FAQ.md
--
diff --git a/docs/documentation/FAQ.md b/docs/documentation/FAQ.md
index a69862e..90222d1 100644
--- a/docs/documentation/FAQ.md
+++ b/docs/documentation/FAQ.md
@@ -112,7 +112,7 @@ You can't change the overall batch size once generated, but 
you can change the n
 
 ### How do I aggregate events by time?
 
-If have records with an immutable timestamp, and you would like to count, 
average or otherwise aggregate them into discrete time buckets, Trident is an 
excellent and scalable solution.
+If you have records with an immutable timestamp, and you would like to count, 
average or otherwise aggregate them into discrete time buckets, Trident is an 
excellent and scalable solution.
 
 Write an `Each` function that turns the timestamp into a time bucket: if the 
bucket size was "by hour", then the timestamp `2013-08-08 12:34:56` would be 
mapped to the `2013-08-08 12:00:00` time bucket, and so would everything else 
in the twelve o'clock hour. Then group on that timebucket and use a grouped 
persistentAggregate. The persistentAggregate uses a local cacheMap backed by a 
data store. Groups with many records require very few reads from the data 
store, and use efficient bulk reads and writes; as long as your data feed is 
relatively prompt Trident will make very efficient use of memory and network. 
Even if a server drops off line for a day, then delivers that full day's worth 
of data in a rush, the old results will be calmly retrieved and updated -- and 
without interfering with calculating the current results.
 



storm git commit: [maven-release-plugin] prepare release v0.9.6

2015-10-22 Thread ptgoetz
Repository: storm
Updated Branches:
  refs/heads/0.9.x-branch fbf98188a -> 39418b20e


[maven-release-plugin] prepare release v0.9.6


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/39418b20
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/39418b20
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/39418b20

Branch: refs/heads/0.9.x-branch
Commit: 39418b20e4c2d03e133d028507bb2f8961861cf0
Parents: fbf9818
Author: P. Taylor Goetz 
Authored: Thu Oct 22 16:54:46 2015 -0400
Committer: P. Taylor Goetz 
Committed: Thu Oct 22 16:54:46 2015 -0400

--
 examples/storm-starter/pom.xml   | 2 +-
 external/storm-hbase/pom.xml | 2 +-
 external/storm-hdfs/pom.xml  | 2 +-
 external/storm-kafka/pom.xml | 2 +-
 pom.xml  | 4 ++--
 storm-buildtools/maven-shade-clojure-transformer/pom.xml | 2 +-
 storm-core/pom.xml   | 2 +-
 storm-dist/binary/pom.xml| 2 +-
 storm-dist/source/pom.xml| 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/39418b20/examples/storm-starter/pom.xml
--
diff --git a/examples/storm-starter/pom.xml b/examples/storm-starter/pom.xml
index f2aacd0..408cd21 100644
--- a/examples/storm-starter/pom.xml
+++ b/examples/storm-starter/pom.xml
@@ -20,7 +20,7 @@
   
   storm
   org.apache.storm
-  0.9.6-SNAPSHOT
+  0.9.6
   ../../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/storm/blob/39418b20/external/storm-hbase/pom.xml
--
diff --git a/external/storm-hbase/pom.xml b/external/storm-hbase/pom.xml
index fe19688..da6c00d 100644
--- a/external/storm-hbase/pom.xml
+++ b/external/storm-hbase/pom.xml
@@ -21,7 +21,7 @@
 
 storm
 org.apache.storm
-0.9.6-SNAPSHOT
+0.9.6
 ../../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/39418b20/external/storm-hdfs/pom.xml
--
diff --git a/external/storm-hdfs/pom.xml b/external/storm-hdfs/pom.xml
index a265490..9e48789 100644
--- a/external/storm-hdfs/pom.xml
+++ b/external/storm-hdfs/pom.xml
@@ -21,7 +21,7 @@
 
 storm
 org.apache.storm
-0.9.6-SNAPSHOT
+0.9.6
 ../../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/39418b20/external/storm-kafka/pom.xml
--
diff --git a/external/storm-kafka/pom.xml b/external/storm-kafka/pom.xml
index 36f77c3..db8375b 100644
--- a/external/storm-kafka/pom.xml
+++ b/external/storm-kafka/pom.xml
@@ -21,7 +21,7 @@
 
 storm
 org.apache.storm
-0.9.6-SNAPSHOT
+0.9.6
 ../../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/39418b20/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 105838d..bc0bd8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.storm
 storm
-0.9.6-SNAPSHOT
+0.9.6
 pom
 Storm
 Distributed and fault-tolerant realtime 
computation
@@ -166,7 +166,7 @@
 
 
scm:git:https://git-wip-us.apache.org/repos/asf/storm.git
 
scm:git:https://git-wip-us.apache.org/repos/asf/storm.git
-HEAD
+v0.9.6
 https://git-wip-us.apache.org/repos/asf/storm
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/39418b20/storm-buildtools/maven-shade-clojure-transformer/pom.xml
--
diff --git a/storm-buildtools/maven-shade-clojure-transformer/pom.xml 
b/storm-buildtools/maven-shade-clojure-transformer/pom.xml
index dfca2a4..e80b4e8 100644
--- a/storm-buildtools/maven-shade-clojure-transformer/pom.xml
+++ b/storm-buildtools/maven-shade-clojure-transformer/pom.xml
@@ -21,7 +21,7 @@
 
 storm
 org.apache.storm
-0.9.6-SNAPSHOT
+0.9.6
 ../../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/39418b20/storm-core/pom.xml
--
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index 3b7d177..31ac343 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -20,7 +20,7 @@
 
 storm
 org.apache.storm
-0.9.6-SNAPSHOT
+0.9.6
 
 org.apache.storm
 storm-core


[2/2] storm git commit: Revert "[maven-release-plugin] prepare release v0.9.6"

2015-10-22 Thread ptgoetz
Revert "[maven-release-plugin] prepare release v0.9.6"

This reverts commit 697059e958879c4daae5f4db57ce9abc04e81bd7.


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/fbf98188
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/fbf98188
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/fbf98188

Branch: refs/heads/0.9.x-branch
Commit: fbf98188a2efa3249d246f4c40a8779fe555dc4d
Parents: 3fc72fb
Author: P. Taylor Goetz 
Authored: Thu Oct 22 16:38:06 2015 -0400
Committer: P. Taylor Goetz 
Committed: Thu Oct 22 16:38:06 2015 -0400

--
 examples/storm-starter/pom.xml   | 2 +-
 external/storm-hbase/pom.xml | 2 +-
 external/storm-hdfs/pom.xml  | 2 +-
 external/storm-kafka/pom.xml | 2 +-
 pom.xml  | 4 ++--
 storm-buildtools/maven-shade-clojure-transformer/pom.xml | 2 +-
 storm-core/pom.xml   | 2 +-
 storm-dist/binary/pom.xml| 2 +-
 storm-dist/source/pom.xml| 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/fbf98188/examples/storm-starter/pom.xml
--
diff --git a/examples/storm-starter/pom.xml b/examples/storm-starter/pom.xml
index 408cd21..f2aacd0 100644
--- a/examples/storm-starter/pom.xml
+++ b/examples/storm-starter/pom.xml
@@ -20,7 +20,7 @@
   
   storm
   org.apache.storm
-  0.9.6
+  0.9.6-SNAPSHOT
   ../../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/storm/blob/fbf98188/external/storm-hbase/pom.xml
--
diff --git a/external/storm-hbase/pom.xml b/external/storm-hbase/pom.xml
index da6c00d..fe19688 100644
--- a/external/storm-hbase/pom.xml
+++ b/external/storm-hbase/pom.xml
@@ -21,7 +21,7 @@
 
 storm
 org.apache.storm
-0.9.6
+0.9.6-SNAPSHOT
 ../../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/fbf98188/external/storm-hdfs/pom.xml
--
diff --git a/external/storm-hdfs/pom.xml b/external/storm-hdfs/pom.xml
index 9e48789..a265490 100644
--- a/external/storm-hdfs/pom.xml
+++ b/external/storm-hdfs/pom.xml
@@ -21,7 +21,7 @@
 
 storm
 org.apache.storm
-0.9.6
+0.9.6-SNAPSHOT
 ../../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/fbf98188/external/storm-kafka/pom.xml
--
diff --git a/external/storm-kafka/pom.xml b/external/storm-kafka/pom.xml
index db8375b..36f77c3 100644
--- a/external/storm-kafka/pom.xml
+++ b/external/storm-kafka/pom.xml
@@ -21,7 +21,7 @@
 
 storm
 org.apache.storm
-0.9.6
+0.9.6-SNAPSHOT
 ../../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/fbf98188/pom.xml
--
diff --git a/pom.xml b/pom.xml
index bc0bd8f..105838d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.storm
 storm
-0.9.6
+0.9.6-SNAPSHOT
 pom
 Storm
 Distributed and fault-tolerant realtime 
computation
@@ -166,7 +166,7 @@
 
 
scm:git:https://git-wip-us.apache.org/repos/asf/storm.git
 
scm:git:https://git-wip-us.apache.org/repos/asf/storm.git
-v0.9.6
+HEAD
 https://git-wip-us.apache.org/repos/asf/storm
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/fbf98188/storm-buildtools/maven-shade-clojure-transformer/pom.xml
--
diff --git a/storm-buildtools/maven-shade-clojure-transformer/pom.xml 
b/storm-buildtools/maven-shade-clojure-transformer/pom.xml
index e80b4e8..dfca2a4 100644
--- a/storm-buildtools/maven-shade-clojure-transformer/pom.xml
+++ b/storm-buildtools/maven-shade-clojure-transformer/pom.xml
@@ -21,7 +21,7 @@
 
 storm
 org.apache.storm
-0.9.6
+0.9.6-SNAPSHOT
 ../../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/fbf98188/storm-core/pom.xml
--
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index 31ac343..3b7d177 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -20,7 +20,7 @@
 
 storm
 org.apache.storm
-0.9.6
+0.9.6-SNAPSHOT
 
 org.apache.storm
 storm-core


[1/2] storm git commit: Revert "[maven-release-plugin] prepare for next development iteration"

2015-10-22 Thread ptgoetz
Repository: storm
Updated Branches:
  refs/heads/0.9.x-branch ed2adde71 -> fbf98188a


Revert "[maven-release-plugin] prepare for next development iteration"

This reverts commit 19a4e129edcaeb8b0615ac928f3107a846992480.


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/3fc72fbc
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3fc72fbc
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3fc72fbc

Branch: refs/heads/0.9.x-branch
Commit: 3fc72fbca91fda1f85ae9b8823001152047b6763
Parents: ed2adde
Author: P. Taylor Goetz 
Authored: Thu Oct 22 16:37:59 2015 -0400
Committer: P. Taylor Goetz 
Committed: Thu Oct 22 16:37:59 2015 -0400

--
 examples/storm-starter/pom.xml   | 2 +-
 external/storm-hbase/pom.xml | 2 +-
 external/storm-hdfs/pom.xml  | 2 +-
 external/storm-kafka/pom.xml | 2 +-
 pom.xml  | 4 ++--
 storm-buildtools/maven-shade-clojure-transformer/pom.xml | 2 +-
 storm-core/pom.xml   | 2 +-
 storm-dist/binary/pom.xml| 2 +-
 storm-dist/source/pom.xml| 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/3fc72fbc/examples/storm-starter/pom.xml
--
diff --git a/examples/storm-starter/pom.xml b/examples/storm-starter/pom.xml
index 96442b1..408cd21 100644
--- a/examples/storm-starter/pom.xml
+++ b/examples/storm-starter/pom.xml
@@ -20,7 +20,7 @@
   
   storm
   org.apache.storm
-  0.9.7-SNAPSHOT
+  0.9.6
   ../../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/storm/blob/3fc72fbc/external/storm-hbase/pom.xml
--
diff --git a/external/storm-hbase/pom.xml b/external/storm-hbase/pom.xml
index 6a68a17..da6c00d 100644
--- a/external/storm-hbase/pom.xml
+++ b/external/storm-hbase/pom.xml
@@ -21,7 +21,7 @@
 
 storm
 org.apache.storm
-0.9.7-SNAPSHOT
+0.9.6
 ../../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/3fc72fbc/external/storm-hdfs/pom.xml
--
diff --git a/external/storm-hdfs/pom.xml b/external/storm-hdfs/pom.xml
index 5a97fc2..9e48789 100644
--- a/external/storm-hdfs/pom.xml
+++ b/external/storm-hdfs/pom.xml
@@ -21,7 +21,7 @@
 
 storm
 org.apache.storm
-0.9.7-SNAPSHOT
+0.9.6
 ../../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/3fc72fbc/external/storm-kafka/pom.xml
--
diff --git a/external/storm-kafka/pom.xml b/external/storm-kafka/pom.xml
index 4f9bf4b..db8375b 100644
--- a/external/storm-kafka/pom.xml
+++ b/external/storm-kafka/pom.xml
@@ -21,7 +21,7 @@
 
 storm
 org.apache.storm
-0.9.7-SNAPSHOT
+0.9.6
 ../../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/3fc72fbc/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 9676f86..bc0bd8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.storm
 storm
-0.9.7-SNAPSHOT
+0.9.6
 pom
 Storm
 Distributed and fault-tolerant realtime 
computation
@@ -166,7 +166,7 @@
 
 
scm:git:https://git-wip-us.apache.org/repos/asf/storm.git
 
scm:git:https://git-wip-us.apache.org/repos/asf/storm.git
-HEAD
+v0.9.6
 https://git-wip-us.apache.org/repos/asf/storm
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/3fc72fbc/storm-buildtools/maven-shade-clojure-transformer/pom.xml
--
diff --git a/storm-buildtools/maven-shade-clojure-transformer/pom.xml 
b/storm-buildtools/maven-shade-clojure-transformer/pom.xml
index 735301b..e80b4e8 100644
--- a/storm-buildtools/maven-shade-clojure-transformer/pom.xml
+++ b/storm-buildtools/maven-shade-clojure-transformer/pom.xml
@@ -21,7 +21,7 @@
 
 storm
 org.apache.storm
-0.9.7-SNAPSHOT
+0.9.6
 ../../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/3fc72fbc/storm-core/pom.xml
--
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index d21a634..31ac343 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -20,7 +20,7 @@
 
 storm
 

Git Push Summary

2015-10-22 Thread ptgoetz
Repository: storm
Updated Tags:  refs/tags/v0.9.6 [deleted] 3cb2b8359


storm git commit: [maven-release-plugin] prepare for next development iteration

2015-10-22 Thread ptgoetz
Repository: storm
Updated Branches:
  refs/heads/0.9.x-branch 39418b20e -> 45e61777b


[maven-release-plugin] prepare for next development iteration


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/45e61777
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/45e61777
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/45e61777

Branch: refs/heads/0.9.x-branch
Commit: 45e61777b11ea03014f9944becca1fe511e84fb6
Parents: 39418b2
Author: P. Taylor Goetz 
Authored: Thu Oct 22 16:54:54 2015 -0400
Committer: P. Taylor Goetz 
Committed: Thu Oct 22 16:54:54 2015 -0400

--
 examples/storm-starter/pom.xml   | 2 +-
 external/storm-hbase/pom.xml | 2 +-
 external/storm-hdfs/pom.xml  | 2 +-
 external/storm-kafka/pom.xml | 2 +-
 pom.xml  | 4 ++--
 storm-buildtools/maven-shade-clojure-transformer/pom.xml | 2 +-
 storm-core/pom.xml   | 2 +-
 storm-dist/binary/pom.xml| 2 +-
 storm-dist/source/pom.xml| 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/45e61777/examples/storm-starter/pom.xml
--
diff --git a/examples/storm-starter/pom.xml b/examples/storm-starter/pom.xml
index 408cd21..96442b1 100644
--- a/examples/storm-starter/pom.xml
+++ b/examples/storm-starter/pom.xml
@@ -20,7 +20,7 @@
   
   storm
   org.apache.storm
-  0.9.6
+  0.9.7-SNAPSHOT
   ../../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/storm/blob/45e61777/external/storm-hbase/pom.xml
--
diff --git a/external/storm-hbase/pom.xml b/external/storm-hbase/pom.xml
index da6c00d..6a68a17 100644
--- a/external/storm-hbase/pom.xml
+++ b/external/storm-hbase/pom.xml
@@ -21,7 +21,7 @@
 
 storm
 org.apache.storm
-0.9.6
+0.9.7-SNAPSHOT
 ../../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/45e61777/external/storm-hdfs/pom.xml
--
diff --git a/external/storm-hdfs/pom.xml b/external/storm-hdfs/pom.xml
index 9e48789..5a97fc2 100644
--- a/external/storm-hdfs/pom.xml
+++ b/external/storm-hdfs/pom.xml
@@ -21,7 +21,7 @@
 
 storm
 org.apache.storm
-0.9.6
+0.9.7-SNAPSHOT
 ../../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/45e61777/external/storm-kafka/pom.xml
--
diff --git a/external/storm-kafka/pom.xml b/external/storm-kafka/pom.xml
index db8375b..4f9bf4b 100644
--- a/external/storm-kafka/pom.xml
+++ b/external/storm-kafka/pom.xml
@@ -21,7 +21,7 @@
 
 storm
 org.apache.storm
-0.9.6
+0.9.7-SNAPSHOT
 ../../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/45e61777/pom.xml
--
diff --git a/pom.xml b/pom.xml
index bc0bd8f..9676f86 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 
 org.apache.storm
 storm
-0.9.6
+0.9.7-SNAPSHOT
 pom
 Storm
 Distributed and fault-tolerant realtime 
computation
@@ -166,7 +166,7 @@
 
 
scm:git:https://git-wip-us.apache.org/repos/asf/storm.git
 
scm:git:https://git-wip-us.apache.org/repos/asf/storm.git
-v0.9.6
+HEAD
 https://git-wip-us.apache.org/repos/asf/storm
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/45e61777/storm-buildtools/maven-shade-clojure-transformer/pom.xml
--
diff --git a/storm-buildtools/maven-shade-clojure-transformer/pom.xml 
b/storm-buildtools/maven-shade-clojure-transformer/pom.xml
index e80b4e8..735301b 100644
--- a/storm-buildtools/maven-shade-clojure-transformer/pom.xml
+++ b/storm-buildtools/maven-shade-clojure-transformer/pom.xml
@@ -21,7 +21,7 @@
 
 storm
 org.apache.storm
-0.9.6
+0.9.7-SNAPSHOT
 ../../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/45e61777/storm-core/pom.xml
--
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index 31ac343..d21a634 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -20,7 +20,7 @@
 
 storm
 org.apache.storm
-0.9.6
+0.9.7-SNAPSHOT
 
 org.apache.storm