storm git commit: Changelog: STORM-2659 and STORM-2640

2017-07-26 Thread srdo 
Repository: storm
Updated Branches:
  refs/heads/master 450ed637f -> c08cfba0b


Changelog: STORM-2659 and STORM-2640


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

Branch: refs/heads/master
Commit: c08cfba0b65513b7b11d5ddbd399f7f15438f9cf
Parents: 450ed63
Author: Stig Rohde Døssing 
Authored: Thu Jul 27 00:35:36 2017 +0200
Committer: Stig Rohde Døssing 
Committed: Thu Jul 27 00:35:36 2017 +0200

--
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/c08cfba0/CHANGELOG.md
--
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a0b7cc9..3ecbc1e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -296,6 +296,7 @@
  * STORM-2379: ElasticSearch connector changes to use new APIs.
 
 ## 1.2.0
+ * STORM-2640: Deprecate KafkaConsumer.subscribe API option, make 
KafkaConsumer.assign the default
  * STORM-2650: Expand property substitution test for Flux to cover non-string 
properties
  * STORM-2642: Storm-kafka-client spout cannot be serialized when using manual 
partition assignment
  * STORM-2541: Fix storm-kafka-client manual subscription not being able to 
start consuming
@@ -316,6 +317,7 @@
  * STORM-2482: Refactor the Storm auto credential plugins to be more usable
 
 ## 1.1.1
+ * STORM-2659: Add daemon.name variable to storm.cmd to fix log4j logging
  * STORM-2652: fix error in open method of JmsSpout
  * STORM-2645: Update storm.py to be python3 compatible
  * STORM-2621: add tuple_population metric

[2/3] storm git commit: Merge branch 'STORM-2542-1.x' of https://github.com/srdo/storm into STORM-2640-1.x-merge

2017-07-26 Thread srdo 
Merge branch 'STORM-2542-1.x' of https://github.com/srdo/storm into 
STORM-2640-1.x-merge


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

Branch: refs/heads/1.x-branch
Commit: 0d64247a56c99321c7398a5942e0389579e48224
Parents: d128cd9 2ebf226
Author: Stig Rohde Døssing 
Authored: Thu Jul 27 00:28:20 2017 +0200
Committer: Stig Rohde Døssing 
Committed: Thu Jul 27 00:28:20 2017 +0200

--
 docs/storm-kafka-client.md  |  7 +-
 .../storm/kafka/spout/KafkaSpoutConfig.java | 29 +++
 .../spout/ManualPartitionSubscription.java  |  1 +
 .../storm/kafka/spout/ManualPartitioner.java|  1 +
 .../storm/kafka/spout/NamedSubscription.java|  4 +-
 .../storm/kafka/spout/PatternSubscription.java  |  4 +-
 .../storm/kafka/spout/KafkaSpoutCommitTest.java | 41 +++--
 .../storm/kafka/spout/KafkaSpoutEmitTest.java   | 53 
 .../kafka/spout/KafkaSpoutRebalanceTest.java| 37 +
 .../kafka/spout/KafkaSpoutRetryLimitTest.java   | 79 +++---
 .../kafka/spout/MaxUncommittedOffsetTest.java   |  7 +-
 .../storm/kafka/spout/NamedTopicFilterTest.java |  3 +-
 .../kafka/spout/PatternTopicFilterTest.java |  2 +
 .../kafka/spout/SingleTopicKafkaSpoutTest.java  | 10 ++-
 .../SpoutWithMockedConsumerSetupHelper.java | 87 
 .../SingleTopicKafkaSpoutConfiguration.java | 46 +++
 16 files changed, 238 insertions(+), 173 deletions(-)
--

[3/3] storm git commit: Changelog: STORM-2640

2017-07-26 Thread srdo 
Changelog: STORM-2640


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

Branch: refs/heads/1.x-branch
Commit: 8efd09e487b39ce7edb12848af8bc390eabd6f83
Parents: 0d64247
Author: Stig Rohde Døssing 
Authored: Thu Jul 27 00:29:52 2017 +0200
Committer: Stig Rohde Døssing 
Committed: Thu Jul 27 00:29:52 2017 +0200

--
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/8efd09e4/CHANGELOG.md
--
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d84ceb..8494e7b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 1.2.0
+ * STORM-2640: Deprecate KafkaConsumer.subscribe API option, make 
KafkaConsumer.assign the default
  * STORM-2650: Expand property substitution test for Flux to cover non-string 
properties
  * STORM-2642: Storm-kafka-client spout cannot be serialized when using manual 
partition assignment
  * STORM-2541: Fix storm-kafka-client manual subscription not being able to 
start consuming

[1/3] storm git commit: STORM-2640: Deprecate KafkaConsumer.subscribe API option, make KafkaConsumer.assign the default

2017-07-26 Thread srdo 
Repository: storm
Updated Branches:
  refs/heads/1.x-branch d128cd9a8 -> 8efd09e48


STORM-2640: Deprecate KafkaConsumer.subscribe API option, make 
KafkaConsumer.assign the default


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

Branch: refs/heads/1.x-branch
Commit: 2ebf22685c0fc1afc3e6fe7707aa43aaa0fe62e5
Parents: 2fe66dc
Author: Stig Rohde Døssing 
Authored: Tue Jul 18 23:46:09 2017 +0200
Committer: Stig Rohde Døssing 
Committed: Tue Jul 25 10:39:17 2017 +0200

--
 docs/storm-kafka-client.md  |  7 +-
 .../storm/kafka/spout/KafkaSpoutConfig.java | 29 +++
 .../spout/ManualPartitionSubscription.java  |  1 +
 .../storm/kafka/spout/ManualPartitioner.java|  1 +
 .../storm/kafka/spout/NamedSubscription.java|  4 +-
 .../storm/kafka/spout/PatternSubscription.java  |  4 +-
 .../storm/kafka/spout/KafkaSpoutCommitTest.java | 41 +++--
 .../storm/kafka/spout/KafkaSpoutEmitTest.java   | 53 
 .../kafka/spout/KafkaSpoutRebalanceTest.java| 37 +
 .../kafka/spout/KafkaSpoutRetryLimitTest.java   | 79 +++---
 .../kafka/spout/MaxUncommittedOffsetTest.java   |  7 +-
 .../storm/kafka/spout/NamedTopicFilterTest.java |  3 +-
 .../kafka/spout/PatternTopicFilterTest.java |  2 +
 .../kafka/spout/SingleTopicKafkaSpoutTest.java  | 10 ++-
 .../SpoutWithMockedConsumerSetupHelper.java | 87 
 .../SingleTopicKafkaSpoutConfiguration.java | 46 +++
 16 files changed, 238 insertions(+), 173 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/2ebf2268/docs/storm-kafka-client.md
--
diff --git a/docs/storm-kafka-client.md b/docs/storm-kafka-client.md
index 9166cb9..93d622e 100644
--- a/docs/storm-kafka-client.md
+++ b/docs/storm-kafka-client.md
@@ -247,12 +247,9 @@ streams.  If you are doing this for Trident a value must 
be in the List returned
 otherwise trident can throw exceptions.
 
 
-### Manual Partition Control (ADVANCED)
+### Manual Partition Assigment (ADVANCED)
 
-By default Kafka will automatically assign partitions to the current set of 
spouts.  It handles lots of things, but in some cases you may want to manually 
assign the partitions.
-This can cause less churn in the assignments when spouts go down and come back 
up, but it can result in a lot of issues if not done right.  This can all be 
handled by subclassing
-Subscription and we have a few implementations that you can look at for 
examples on how to do this.  ManualPartitionNamedSubscription and 
ManualPartitionPatternSubscription.  Again
-please be careful when using these or implementing your own.
+By default the KafkaSpout instances will be assigned partitions using a round 
robin strategy. If you need to customize partition assignment, you must 
implement the `ManualPartitioner` interface. The implementation can be passed 
to the `ManualPartitionSubscription` constructor, and the `Subscription` can 
then be set in the `KafkaSpoutConfig` via the `KafkaSpoutConfig.Builder` 
constructor. Please take care when supplying a custom implementation, since an 
incorrect `ManualPartitioner` implementation could leave some partitions 
unread, or concurrently read by multiple spout instances. See the 
`RoundRobinManualPartitioner` for an example of how to implement this 
functionality.
 
 ## Use the Maven Shade Plugin to Build the Uber Jar
 

http://git-wip-us.apache.org/repos/asf/storm/blob/2ebf2268/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpoutConfig.java
--
diff --git 
a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpoutConfig.java
 
b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpoutConfig.java
index 2b5a81a..833ce4a 100644
--- 
a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpoutConfig.java
+++ 
b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpoutConfig.java
@@ -28,6 +28,7 @@ import org.apache.storm.tuple.Fields;
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -55,12 +56,6 @@ public class KafkaSpoutConfig implements Serializable {
 public static final KafkaSpoutRetryService DEFAULT_RETRY_SERVICE =
 new KafkaSpoutRetryExponentialBackoff(TimeInterval.seconds(0), 
TimeInterval.milliSeconds(2),

[1/3] storm git commit: STORM-2659: Add daemon.name variable to storm.cmd to fix log4j logging

2017-07-26 Thread srdo 
Repository: storm
Updated Branches:
  refs/heads/1.x-branch 0d6e4cdee -> d128cd9a8


STORM-2659: Add daemon.name variable to storm.cmd to fix log4j logging


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

Branch: refs/heads/1.x-branch
Commit: 02880c08fd51f2c65779e0a176eb003f84d4e281
Parents: 2fe66dc
Author: Stig Rohde Døssing 
Authored: Tue Jul 25 22:01:04 2017 +0200
Committer: Stig Rohde Døssing 
Committed: Tue Jul 25 22:01:04 2017 +0200

--
 bin/storm.cmd | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/02880c08/bin/storm.cmd
--
diff --git a/bin/storm.cmd b/bin/storm.cmd
index 23d65c6..32183c8 100644
--- a/bin/storm.cmd
+++ b/bin/storm.cmd
@@ -145,6 +145,7 @@
 
 :drpc
   set CLASS=org.apache.storm.daemon.drpc
+  set STORM_OPTS=%STORM_OPTS% -Ddaemon.name=drpc
   "%JAVA%" -client -Dstorm.options= -Dstorm.conf.file= -cp "%CLASSPATH%" 
org.apache.storm.command.config_value drpc.childopts > %CMD_TEMP_FILE%
   FOR /F "delims=" %%i in (%CMD_TEMP_FILE%) do (
  FOR /F "tokens=1,* delims= " %%a in ("%%i") do (
@@ -171,6 +172,7 @@
 
 :logviewer
   set CLASS=org.apache.storm.daemon.logviewer
+  set STORM_OPTS=%STORM_OPTS% -Ddaemon.name=logviewer
"%JAVA%" -client -Dstorm.options= -Dstorm.conf.file= -cp "%CLASSPATH%" 
org.apache.storm.command.config_value logviewer.childopts > %CMD_TEMP_FILE%
   FOR /F "delims=" %%i in (%CMD_TEMP_FILE%) do (
  FOR /F "tokens=1,* delims= " %%a in ("%%i") do (
@@ -183,6 +185,7 @@
 
 :nimbus
   set CLASS=org.apache.storm.daemon.nimbus
+  set STORM_OPTS=%STORM_OPTS% -Ddaemon.name=nimbus
   "%JAVA%" -client -Dstorm.options= -Dstorm.conf.file= -cp "%CLASSPATH%" 
org.apache.storm.command.config_value nimbus.childopts > %CMD_TEMP_FILE%
   FOR /F "delims=" %%i in (%CMD_TEMP_FILE%) do (
  FOR /F "tokens=1,* delims= " %%a in ("%%i") do (
@@ -215,6 +218,7 @@
   
 :supervisor
   set CLASS=org.apache.storm.daemon.supervisor.Supervisor
+  set STORM_OPTS=%STORM_OPTS% -Ddaemon.name=supervisor
   "%JAVA%" -client -Dstorm.options= -Dstorm.conf.file= -cp "%CLASSPATH%" 
org.apache.storm.command.config_value supervisor.childopts > %CMD_TEMP_FILE%
   FOR /F "delims=" %%i in (%CMD_TEMP_FILE%) do (
  FOR /F "tokens=1,* delims= " %%a in ("%%i") do (
@@ -227,6 +231,7 @@
 
 :ui
   set CLASS=org.apache.storm.ui.core
+  set STORM_OPTS=%STORM_OPTS% -Ddaemon.name=ui
   set CLASSPATH=%CLASSPATH%;%STORM_HOME%
   "%JAVA%" -client -Dstorm.options= -Dstorm.conf.file= -cp "%CLASSPATH%" 
org.apache.storm.command.config_value ui.childopts > %CMD_TEMP_FILE%
   FOR /F "delims=" %%i in (%CMD_TEMP_FILE%) do (

[2/3] storm git commit: Merge branch 'STORM-2659' of https://github.com/srdo/storm into STORM-2659-1.x-merge

2017-07-26 Thread srdo 
Merge branch 'STORM-2659' of https://github.com/srdo/storm into 
STORM-2659-1.x-merge


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

Branch: refs/heads/1.x-branch
Commit: 3018f37efe5c1d25427f2dc43c84582ba256a8de
Parents: 0d6e4cd 02880c0
Author: Stig Rohde Døssing 
Authored: Wed Jul 26 21:46:36 2017 +0200
Committer: Stig Rohde Døssing 
Committed: Wed Jul 26 21:46:36 2017 +0200

--
 bin/storm.cmd | 5 +
 1 file changed, 5 insertions(+)
--

[3/3] storm git commit: Changelog: STORM-2659

2017-07-26 Thread srdo 
Changelog: STORM-2659


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

Branch: refs/heads/1.x-branch
Commit: d128cd9a863d7bf0e9674a99971418f3d9379fc6
Parents: 3018f37
Author: Stig Rohde Døssing 
Authored: Wed Jul 26 21:46:59 2017 +0200
Committer: Stig Rohde Døssing 
Committed: Wed Jul 26 21:46:59 2017 +0200

--
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/d128cd9a/CHANGELOG.md
--
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e3faf6f..1d84ceb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@
  * STORM-2482: Refactor the Storm auto credential plugins to be more usable
 
 ## 1.1.1
+ * STORM-2659: Add daemon.name variable to storm.cmd to fix log4j logging
  * STORM-2652: fix error in open method of JmsSpout
  * STORM-2645: Update storm.py to be python3 compatible
  * STORM-2621: add tuple_population metric

[2/2] storm git commit: Changelog: STORM-2659

2017-07-26 Thread srdo 
Changelog: STORM-2659


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

Branch: refs/heads/1.1.x-branch
Commit: 57372baf295f4f41b7d32e537518ee9fbc9820fd
Parents: f4933cb
Author: Stig Rohde Døssing 
Authored: Wed Jul 26 21:46:10 2017 +0200
Committer: Stig Rohde Døssing 
Committed: Wed Jul 26 21:46:10 2017 +0200

--
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/57372baf/CHANGELOG.md
--
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2bccac4..09b1bb6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 1.1.1
+ * STORM-2659: Add daemon.name variable to storm.cmd to fix log4j logging
  * STORM-2652: fix error in open method of JmsSpout
  * STORM-2645: Update storm.py to be python3 compatible
  * STORM-2621: add tuple_population metric

[1/2] storm git commit: STORM-2659: Add daemon.name variable to storm.cmd to fix log4j logging

2017-07-26 Thread srdo 
Repository: storm
Updated Branches:
  refs/heads/1.1.x-branch ebdde9fc2 -> 57372baf2


STORM-2659: Add daemon.name variable to storm.cmd to fix log4j logging


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

Branch: refs/heads/1.1.x-branch
Commit: f4933cb9a4d0892065bc854fd8234b28e712a11f
Parents: ebdde9f
Author: Stig Rohde Døssing 
Authored: Tue Jul 25 22:01:04 2017 +0200
Committer: Stig Rohde Døssing 
Committed: Wed Jul 26 21:39:53 2017 +0200

--
 bin/storm.cmd | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/f4933cb9/bin/storm.cmd
--
diff --git a/bin/storm.cmd b/bin/storm.cmd
index 23d65c6..32183c8 100644
--- a/bin/storm.cmd
+++ b/bin/storm.cmd
@@ -145,6 +145,7 @@
 
 :drpc
   set CLASS=org.apache.storm.daemon.drpc
+  set STORM_OPTS=%STORM_OPTS% -Ddaemon.name=drpc
   "%JAVA%" -client -Dstorm.options= -Dstorm.conf.file= -cp "%CLASSPATH%" 
org.apache.storm.command.config_value drpc.childopts > %CMD_TEMP_FILE%
   FOR /F "delims=" %%i in (%CMD_TEMP_FILE%) do (
  FOR /F "tokens=1,* delims= " %%a in ("%%i") do (
@@ -171,6 +172,7 @@
 
 :logviewer
   set CLASS=org.apache.storm.daemon.logviewer
+  set STORM_OPTS=%STORM_OPTS% -Ddaemon.name=logviewer
"%JAVA%" -client -Dstorm.options= -Dstorm.conf.file= -cp "%CLASSPATH%" 
org.apache.storm.command.config_value logviewer.childopts > %CMD_TEMP_FILE%
   FOR /F "delims=" %%i in (%CMD_TEMP_FILE%) do (
  FOR /F "tokens=1,* delims= " %%a in ("%%i") do (
@@ -183,6 +185,7 @@
 
 :nimbus
   set CLASS=org.apache.storm.daemon.nimbus
+  set STORM_OPTS=%STORM_OPTS% -Ddaemon.name=nimbus
   "%JAVA%" -client -Dstorm.options= -Dstorm.conf.file= -cp "%CLASSPATH%" 
org.apache.storm.command.config_value nimbus.childopts > %CMD_TEMP_FILE%
   FOR /F "delims=" %%i in (%CMD_TEMP_FILE%) do (
  FOR /F "tokens=1,* delims= " %%a in ("%%i") do (
@@ -215,6 +218,7 @@
   
 :supervisor
   set CLASS=org.apache.storm.daemon.supervisor.Supervisor
+  set STORM_OPTS=%STORM_OPTS% -Ddaemon.name=supervisor
   "%JAVA%" -client -Dstorm.options= -Dstorm.conf.file= -cp "%CLASSPATH%" 
org.apache.storm.command.config_value supervisor.childopts > %CMD_TEMP_FILE%
   FOR /F "delims=" %%i in (%CMD_TEMP_FILE%) do (
  FOR /F "tokens=1,* delims= " %%a in ("%%i") do (
@@ -227,6 +231,7 @@
 
 :ui
   set CLASS=org.apache.storm.ui.core
+  set STORM_OPTS=%STORM_OPTS% -Ddaemon.name=ui
   set CLASSPATH=%CLASSPATH%;%STORM_HOME%
   "%JAVA%" -client -Dstorm.options= -Dstorm.conf.file= -cp "%CLASSPATH%" 
org.apache.storm.command.config_value ui.childopts > %CMD_TEMP_FILE%
   FOR /F "delims=" %%i in (%CMD_TEMP_FILE%) do (

[storm] Git Push Summary

2017-07-26 Thread ptgoetz 
Repository: storm
Updated Tags:  refs/tags/v1.1.1 [deleted] 1e3904925

[3/3] storm git commit: Revert "set pom version to 1.1.1-SNAPSHOT"

2017-07-26 Thread ptgoetz 
Revert "set pom version to 1.1.1-SNAPSHOT"

This reverts commit 792273ac1277fa5477c40f9d186aa0b0dfc263c2.


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

Branch: refs/heads/1.x-branch
Commit: 0d6e4cdee3147e30bb3c0710dd56e4c1e4536993
Parents: 394fac7
Author: P. Taylor Goetz 
Authored: Wed Jul 26 15:36:36 2017 -0400
Committer: P. Taylor Goetz 
Committed: Wed Jul 26 15:36:36 2017 -0400

--
 CHANGELOG.md  | 4 +++-
 examples/storm-elasticsearch-examples/pom.xml | 2 +-
 examples/storm-hbase-examples/pom.xml | 2 +-
 examples/storm-hdfs-examples/pom.xml  | 2 +-
 examples/storm-hive-examples/pom.xml  | 2 +-
 examples/storm-jdbc-examples/pom.xml  | 2 +-
 examples/storm-jms-examples/pom.xml   | 2 +-
 examples/storm-kafka-client-examples/pom.xml  | 2 +-
 examples/storm-kafka-examples/pom.xml | 2 +-
 examples/storm-mongodb-examples/pom.xml   | 2 +-
 examples/storm-mqtt-examples/pom.xml  | 2 +-
 examples/storm-opentsdb-examples/pom.xml  | 2 +-
 examples/storm-perf/pom.xml   | 2 +-
 examples/storm-pmml-examples/pom.xml  | 2 +-
 examples/storm-redis-examples/pom.xml | 2 +-
 examples/storm-solr-examples/pom.xml  | 2 +-
 examples/storm-starter/pom.xml| 2 +-
 external/flux/flux-core/pom.xml   | 2 +-
 external/flux/flux-wrappers/pom.xml   | 2 +-
 external/flux/pom.xml | 2 +-
 external/sql/pom.xml  | 2 +-
 external/sql/storm-sql-core/pom.xml   | 2 +-
 external/sql/storm-sql-external/storm-sql-hdfs/pom.xml| 2 +-
 external/sql/storm-sql-external/storm-sql-kafka/pom.xml   | 2 +-
 external/sql/storm-sql-external/storm-sql-mongodb/pom.xml | 2 +-
 external/sql/storm-sql-external/storm-sql-redis/pom.xml   | 2 +-
 external/sql/storm-sql-runtime/pom.xml| 2 +-
 external/storm-autocreds/pom.xml  | 2 +-
 external/storm-cassandra/pom.xml  | 2 +-
 external/storm-druid/pom.xml  | 2 +-
 external/storm-elasticsearch/pom.xml  | 2 +-
 external/storm-eventhubs/pom.xml  | 2 +-
 external/storm-hbase/pom.xml  | 2 +-
 external/storm-hdfs/pom.xml   | 2 +-
 external/storm-hive/pom.xml   | 2 +-
 external/storm-jdbc/pom.xml   | 2 +-
 external/storm-jms/pom.xml| 2 +-
 external/storm-kafka-client/pom.xml   | 2 +-
 external/storm-kafka-monitor/pom.xml  | 2 +-
 external/storm-kafka/pom.xml  | 2 +-
 external/storm-kinesis/pom.xml| 2 +-
 external/storm-metrics/pom.xml| 2 +-
 external/storm-mongodb/pom.xml| 2 +-
 external/storm-mqtt/pom.xml   | 2 +-
 external/storm-opentsdb/pom.xml   | 2 +-
 external/storm-pmml/pom.xml   | 2 +-
 external/storm-redis/pom.xml  | 2 +-
 external/storm-solr/pom.xml   | 2 +-
 external/storm-submit-tools/pom.xml   | 2 +-
 pom.xml   | 2 +-
 storm-buildtools/maven-shade-clojure-transformer/pom.xml  | 2 +-
 storm-buildtools/storm-maven-plugins/pom.xml  | 2 +-
 storm-core/pom.xml| 2 +-
 storm-dist/binary/pom.xml | 2 +-
 storm-dist/source/pom.xml | 2 +-
 storm-multilang/javascript/pom.xml| 2 +-
 storm-multilang/python/pom.xml| 2 +-
 storm-multilang/ruby/pom.xml  | 2 +-
 storm-rename-hack/pom.xml | 2 +-
 59 files changed, 61 insertions(+), 59 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/0d6e4cde/CHANGELOG.md
--
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5c64df..e3faf6f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@

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

2017-07-26 Thread ptgoetz 
Repository: storm
Updated Branches:
  refs/heads/1.x-branch 2fe66dc17 -> 0d6e4cdee


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

This reverts commit 2fe66dc17932d1be3c1291e4504815f53e8d034e.


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

Branch: refs/heads/1.x-branch
Commit: e4b5f39c0ae751b18d4fa94754f7f093f7743d81
Parents: 2fe66dc
Author: P. Taylor Goetz 
Authored: Wed Jul 26 15:36:28 2017 -0400
Committer: P. Taylor Goetz 
Committed: Wed Jul 26 15:36:28 2017 -0400

--
 examples/storm-elasticsearch-examples/pom.xml | 2 +-
 examples/storm-hbase-examples/pom.xml | 2 +-
 examples/storm-hdfs-examples/pom.xml  | 2 +-
 examples/storm-hive-examples/pom.xml  | 2 +-
 examples/storm-jdbc-examples/pom.xml  | 2 +-
 examples/storm-jms-examples/pom.xml   | 2 +-
 examples/storm-kafka-client-examples/pom.xml  | 2 +-
 examples/storm-kafka-examples/pom.xml | 2 +-
 examples/storm-mongodb-examples/pom.xml   | 2 +-
 examples/storm-mqtt-examples/pom.xml  | 2 +-
 examples/storm-opentsdb-examples/pom.xml  | 2 +-
 examples/storm-perf/pom.xml   | 2 +-
 examples/storm-pmml-examples/pom.xml  | 2 +-
 examples/storm-redis-examples/pom.xml | 2 +-
 examples/storm-solr-examples/pom.xml  | 2 +-
 examples/storm-starter/pom.xml| 2 +-
 external/flux/flux-core/pom.xml   | 2 +-
 external/flux/flux-wrappers/pom.xml   | 2 +-
 external/flux/pom.xml | 2 +-
 external/sql/pom.xml  | 2 +-
 external/sql/storm-sql-core/pom.xml   | 2 +-
 external/sql/storm-sql-external/storm-sql-hdfs/pom.xml| 2 +-
 external/sql/storm-sql-external/storm-sql-kafka/pom.xml   | 2 +-
 external/sql/storm-sql-external/storm-sql-mongodb/pom.xml | 2 +-
 external/sql/storm-sql-external/storm-sql-redis/pom.xml   | 2 +-
 external/sql/storm-sql-runtime/pom.xml| 2 +-
 external/storm-autocreds/pom.xml  | 2 +-
 external/storm-cassandra/pom.xml  | 2 +-
 external/storm-druid/pom.xml  | 2 +-
 external/storm-elasticsearch/pom.xml  | 2 +-
 external/storm-eventhubs/pom.xml  | 2 +-
 external/storm-hbase/pom.xml  | 2 +-
 external/storm-hdfs/pom.xml   | 2 +-
 external/storm-hive/pom.xml   | 2 +-
 external/storm-jdbc/pom.xml   | 2 +-
 external/storm-jms/pom.xml| 2 +-
 external/storm-kafka-client/pom.xml   | 2 +-
 external/storm-kafka-monitor/pom.xml  | 2 +-
 external/storm-kafka/pom.xml  | 2 +-
 external/storm-kinesis/pom.xml| 2 +-
 external/storm-metrics/pom.xml| 2 +-
 external/storm-mongodb/pom.xml| 2 +-
 external/storm-mqtt/pom.xml   | 2 +-
 external/storm-opentsdb/pom.xml   | 2 +-
 external/storm-pmml/pom.xml   | 2 +-
 external/storm-redis/pom.xml  | 2 +-
 external/storm-solr/pom.xml   | 2 +-
 external/storm-submit-tools/pom.xml   | 2 +-
 pom.xml   | 4 ++--
 storm-buildtools/maven-shade-clojure-transformer/pom.xml  | 2 +-
 storm-buildtools/storm-maven-plugins/pom.xml  | 2 +-
 storm-core/pom.xml| 2 +-
 storm-dist/binary/pom.xml | 2 +-
 storm-dist/source/pom.xml | 2 +-
 storm-multilang/javascript/pom.xml| 2 +-
 storm-multilang/python/pom.xml| 2 +-
 storm-multilang/ruby/pom.xml  | 2 +-
 storm-rename-hack/pom.xml | 2 +-
 58 files changed, 59 insertions(+), 59 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/e4b5f39c/examples/storm-elasticsearch-examples/pom.xml
--
diff --git

[2/3] storm git commit: Revert "[maven-release-plugin] prepare release v1.1.1"

2017-07-26 Thread ptgoetz 
Revert "[maven-release-plugin] prepare release v1.1.1"

This reverts commit 88f0b8a45553ea960164fab18c736a5cdbae8e58.


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

Branch: refs/heads/1.x-branch
Commit: 394fac74cc78c48c8c655548554d2641853cafb8
Parents: e4b5f39
Author: P. Taylor Goetz 
Authored: Wed Jul 26 15:36:33 2017 -0400
Committer: P. Taylor Goetz 
Committed: Wed Jul 26 15:36:33 2017 -0400

--
 examples/storm-elasticsearch-examples/pom.xml | 2 +-
 examples/storm-hbase-examples/pom.xml | 2 +-
 examples/storm-hdfs-examples/pom.xml  | 2 +-
 examples/storm-hive-examples/pom.xml  | 2 +-
 examples/storm-jdbc-examples/pom.xml  | 2 +-
 examples/storm-jms-examples/pom.xml   | 2 +-
 examples/storm-kafka-client-examples/pom.xml  | 2 +-
 examples/storm-kafka-examples/pom.xml | 2 +-
 examples/storm-mongodb-examples/pom.xml   | 2 +-
 examples/storm-mqtt-examples/pom.xml  | 2 +-
 examples/storm-opentsdb-examples/pom.xml  | 2 +-
 examples/storm-perf/pom.xml   | 2 +-
 examples/storm-pmml-examples/pom.xml  | 2 +-
 examples/storm-redis-examples/pom.xml | 2 +-
 examples/storm-solr-examples/pom.xml  | 2 +-
 examples/storm-starter/pom.xml| 2 +-
 external/flux/flux-core/pom.xml   | 2 +-
 external/flux/flux-wrappers/pom.xml   | 2 +-
 external/flux/pom.xml | 2 +-
 external/sql/pom.xml  | 2 +-
 external/sql/storm-sql-core/pom.xml   | 2 +-
 external/sql/storm-sql-external/storm-sql-hdfs/pom.xml| 2 +-
 external/sql/storm-sql-external/storm-sql-kafka/pom.xml   | 2 +-
 external/sql/storm-sql-external/storm-sql-mongodb/pom.xml | 2 +-
 external/sql/storm-sql-external/storm-sql-redis/pom.xml   | 2 +-
 external/sql/storm-sql-runtime/pom.xml| 2 +-
 external/storm-autocreds/pom.xml  | 6 --
 external/storm-cassandra/pom.xml  | 2 +-
 external/storm-druid/pom.xml  | 2 +-
 external/storm-elasticsearch/pom.xml  | 2 +-
 external/storm-eventhubs/pom.xml  | 2 +-
 external/storm-hbase/pom.xml  | 2 +-
 external/storm-hdfs/pom.xml   | 2 +-
 external/storm-hive/pom.xml   | 2 +-
 external/storm-jdbc/pom.xml   | 2 +-
 external/storm-jms/pom.xml| 2 +-
 external/storm-kafka-client/pom.xml   | 2 +-
 external/storm-kafka-monitor/pom.xml  | 2 +-
 external/storm-kafka/pom.xml  | 2 +-
 external/storm-kinesis/pom.xml| 2 +-
 external/storm-metrics/pom.xml| 2 +-
 external/storm-mongodb/pom.xml| 2 +-
 external/storm-mqtt/pom.xml   | 2 +-
 external/storm-opentsdb/pom.xml   | 2 +-
 external/storm-pmml/pom.xml   | 2 +-
 external/storm-redis/pom.xml  | 2 +-
 external/storm-solr/pom.xml   | 2 +-
 external/storm-submit-tools/pom.xml   | 2 +-
 pom.xml   | 4 ++--
 storm-buildtools/maven-shade-clojure-transformer/pom.xml  | 2 +-
 storm-buildtools/storm-maven-plugins/pom.xml  | 2 +-
 storm-core/pom.xml| 2 +-
 storm-dist/binary/pom.xml | 2 +-
 storm-dist/source/pom.xml | 2 +-
 storm-multilang/javascript/pom.xml| 2 +-
 storm-multilang/python/pom.xml| 2 +-
 storm-multilang/ruby/pom.xml  | 2 +-
 storm-rename-hack/pom.xml | 2 +-
 58 files changed, 62 insertions(+), 60 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/394fac74/examples/storm-elasticsearch-examples/pom.xml
--
diff --git a/examples/storm-elasticsearch-examples/pom.xml 
b/examples/storm-elasticsearch-examples/pom.xml
index 1bb27ab..b3b5aaa 100644
---