[2/2] storm git commit: [maven-release-plugin] prepare release v0.10.0

2015-10-23 Thread ptgoetz 
[maven-release-plugin] prepare release v0.10.0


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

Branch: refs/heads/0.10.x-branch
Commit: d02f94268dec229d1125a24fdf53fa303cbc2b29
Parents: e182980
Author: P. Taylor Goetz 
Authored: Fri Oct 23 15:05:58 2015 -0400
Committer: P. Taylor Goetz 
Committed: Fri Oct 23 15:05:58 2015 -0400

--
 examples/storm-starter/pom.xml   | 2 +-
 external/flux/flux-core/pom.xml  | 2 +-
 external/flux/flux-examples/pom.xml  | 2 +-
 external/flux/flux-wrappers/pom.xml  | 2 +-
 external/flux/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-kafka/pom.xml | 2 +-
 external/storm-redis/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   | 6 +++---
 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 +-
 21 files changed, 24 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/d02f9426/examples/storm-starter/pom.xml
--
diff --git a/examples/storm-starter/pom.xml b/examples/storm-starter/pom.xml
index 32ea2e1..eccbb29 100644
--- a/examples/storm-starter/pom.xml
+++ b/examples/storm-starter/pom.xml
@@ -20,7 +20,7 @@
   
   storm
   org.apache.storm
-  0.10.0-beta2-SNAPSHOT
+  0.10.0
   ../../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/storm/blob/d02f9426/external/flux/flux-core/pom.xml
--
diff --git a/external/flux/flux-core/pom.xml b/external/flux/flux-core/pom.xml
index 0e56bc7..e852a2a 100644
--- a/external/flux/flux-core/pom.xml
+++ b/external/flux/flux-core/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.storm
 flux
-0.10.0-beta2-SNAPSHOT
+0.10.0
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/d02f9426/external/flux/flux-examples/pom.xml
--
diff --git a/external/flux/flux-examples/pom.xml 
b/external/flux/flux-examples/pom.xml
index 9a46b5b..d7543ac 100644
--- a/external/flux/flux-examples/pom.xml
+++ b/external/flux/flux-examples/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.storm
 flux
-0.10.0-beta2-SNAPSHOT
+0.10.0
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/d02f9426/external/flux/flux-wrappers/pom.xml
--
diff --git a/external/flux/flux-wrappers/pom.xml 
b/external/flux/flux-wrappers/pom.xml
index 995ef79..6ff542e 100644
--- a/external/flux/flux-wrappers/pom.xml
+++ b/external/flux/flux-wrappers/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.storm
 flux
-0.10.0-beta2-SNAPSHOT
+0.10.0
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/d02f9426/external/flux/pom.xml
--
diff --git a/external/flux/pom.xml b/external/flux/pom.xml
index 6ab8a92..96840d7 100644
--- a/external/flux/pom.xml
+++ b/external/flux/pom.xml
@@ -26,7 +26,7 @@
 
 storm
 org.apache.storm
-0.10.0-beta2-SNAPSHOT
+0.10.0
 ../../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/d02f9426/external/storm-eventhubs/pom.xml
--
diff --git a/external/storm-eventhubs/pom.xml b/external/storm-eventhubs/pom.xml
index 630fc75..a14f1a6 100755
--- a/external/storm-eventhubs/pom.xml
+++ b/external/storm-eventhubs/pom.xml
@@ -21,7 +21,7 @@
 
 storm
 org.apache.storm
-

[1/2] storm git commit: fix javadoc errors

2015-10-23 Thread ptgoetz 
Repository: storm
Updated Branches:
  refs/heads/0.10.x-branch df8ad6109 -> d02f94268


fix javadoc errors


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

Branch: refs/heads/0.10.x-branch
Commit: e182980704ff1159b619e48970fb0d50a303b546
Parents: df8ad61
Author: P. Taylor Goetz 
Authored: Fri Oct 23 14:39:11 2015 -0400
Committer: P. Taylor Goetz 
Committed: Fri Oct 23 14:39:11 2015 -0400

--
 .../src/jvm/storm/starter/BasicDRPCTopology.java  |  2 +-
 .../src/jvm/storm/starter/ReachTopology.java  |  8 
 .../src/jvm/storm/starter/TransactionalWords.java |  4 ++--
 .../storm/starter/bolt/AbstractRankerBolt.java|  2 +-
 .../starter/bolt/IntermediateRankingsBolt.java|  2 +-
 .../jvm/storm/starter/bolt/RollingCountBolt.java  |  6 +++---
 .../jvm/storm/starter/bolt/TotalRankingsBolt.java |  2 +-
 .../starter/tools/NthLastModifiedTimeTracker.java |  4 ++--
 .../starter/tools/RankableObjectWithFields.java   |  4 ++--
 .../storm/starter/tools/SlidingWindowCounter.java | 16 
 .../jvm/storm/starter/tools/SlotBasedCounter.java |  2 +-
 .../apache/storm/hive/bolt/mapper/HiveMapper.java | 12 ++--
 .../org/apache/storm/hive/common/HiveWriter.java  |  6 +++---
 .../apache/storm/jdbc/bolt/JdbcInsertBolt.java|  2 +-
 .../java/org/apache/storm/jdbc/common/Column.java |  6 +++---
 .../src/jvm/storm/kafka/bolt/KafkaBolt.java   | 14 +++---
 .../storm/redis/bolt/AbstractRedisBolt.java   |  8 
 .../apache/storm/redis/bolt/RedisLookupBolt.java  |  2 +-
 .../apache/storm/redis/bolt/RedisStoreBolt.java   |  2 +-
 .../redis/common/config/JedisClusterConfig.java   |  4 ++--
 .../redis/common/config/JedisPoolConfig.java  |  2 +-
 .../common/container/JedisClusterContainer.java   |  2 +-
 .../trident/state/AbstractRedisMapState.java  | 16 +---
 .../trident/state/AbstractRedisStateQuerier.java  |  2 +-
 .../trident/state/AbstractRedisStateUpdater.java  |  2 +-
 .../storm/redis/trident/state/KeyFactory.java |  4 ++--
 .../apache/storm/redis/trident/state/Options.java |  2 +-
 .../redis/trident/state/RedisClusterState.java|  2 +-
 .../storm/redis/trident/state/RedisState.java |  2 +-
 storm-core/src/jvm/backtype/storm/Config.java | 18 +-
 .../src/jvm/backtype/storm/ConfigValidation.java  |  2 +-
 .../storm/metric/api/rpc/CountShellMetric.java|  2 +-
 .../storm/metric/api/rpc/IShellMetric.java|  5 ++---
 .../src/jvm/backtype/storm/scheduler/Cluster.java | 10 +-
 .../storm/scheduler/SchedulerAssignment.java  |  2 +-
 .../storm/security/INimbusCredentialPlugin.java   |  1 -
 .../backtype/storm/security/auth/AuthUtils.java   |  8 
 .../security/auth/DefaultPrincipalToLocal.java|  2 +-
 .../backtype/storm/security/auth/IAuthorizer.java |  4 ++--
 .../storm/security/auth/IPrincipalToLocal.java|  2 +-
 .../security/auth/KerberosPrincipalToLocal.java   |  2 +-
 .../security/auth/authorizer/DenyAuthorizer.java  |  4 ++--
 .../security/auth/authorizer/NoopAuthorizer.java  |  2 +-
 .../authorizer/SimpleWhitelistAuthorizer.java |  2 +-
 .../src/jvm/backtype/storm/spout/ISpout.java  |  4 
 .../jvm/backtype/storm/task/OutputCollector.java  |  2 +-
 .../jvm/backtype/storm/testing/MockedSources.java |  2 +-
 .../src/jvm/backtype/storm/testing/TestJob.java   |  1 +
 .../backtype/storm/topology/InputDeclarer.java|  4 ++--
 .../src/jvm/backtype/storm/tuple/Tuple.java   |  3 ++-
 .../src/jvm/backtype/storm/utils/ShellUtils.java  |  2 +-
 .../StormBoundedExponentialBackoffRetry.java  |  4 ++--
 .../jvm/backtype/storm/utils/WritableUtils.java   |  4 ++--
 53 files changed, 120 insertions(+), 114 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/e1829807/examples/storm-starter/src/jvm/storm/starter/BasicDRPCTopology.java
--
diff --git 
a/examples/storm-starter/src/jvm/storm/starter/BasicDRPCTopology.java 
b/examples/storm-starter/src/jvm/storm/starter/BasicDRPCTopology.java
index a12b017..3085b6c 100644
--- a/examples/storm-starter/src/jvm/storm/starter/BasicDRPCTopology.java
+++ b/examples/storm-starter/src/jvm/storm/starter/BasicDRPCTopology.java
@@ -32,7 +32,7 @@ import backtype.storm.tuple.Values;
 /**
  * This topology is a basic example of doing distributed RPC on top of Storm. 
It implements a function that appends a
  * "!" to any string you send the DRPC function.
- * 
+ * 
  * See https://github.com/nathanmarz/storm/wiki/Distributed-RPC for more 
information on doing distributed RPC on top of
  * Storm.

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

2015-10-23 Thread ptgoetz 
Repository: storm
Updated Branches:
  refs/heads/0.10.x-branch d02f94268 -> 122686352


[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/12268635
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/12268635
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/12268635

Branch: refs/heads/0.10.x-branch
Commit: 1226863525ab30a69ee1c307da53920339e5f741
Parents: d02f942
Author: P. Taylor Goetz 
Authored: Fri Oct 23 15:06:08 2015 -0400
Committer: P. Taylor Goetz 
Committed: Fri Oct 23 15:06:08 2015 -0400

--
 examples/storm-starter/pom.xml   | 2 +-
 external/flux/flux-core/pom.xml  | 2 +-
 external/flux/flux-examples/pom.xml  | 2 +-
 external/flux/flux-wrappers/pom.xml  | 2 +-
 external/flux/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-kafka/pom.xml | 2 +-
 external/storm-redis/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 +-
 21 files changed, 22 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/12268635/examples/storm-starter/pom.xml
--
diff --git a/examples/storm-starter/pom.xml b/examples/storm-starter/pom.xml
index eccbb29..f524062 100644
--- a/examples/storm-starter/pom.xml
+++ b/examples/storm-starter/pom.xml
@@ -20,7 +20,7 @@
   
   storm
   org.apache.storm
-  0.10.0
+  0.10.1-SNAPSHOT
   ../../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/storm/blob/12268635/external/flux/flux-core/pom.xml
--
diff --git a/external/flux/flux-core/pom.xml b/external/flux/flux-core/pom.xml
index e852a2a..90f9e6a 100644
--- a/external/flux/flux-core/pom.xml
+++ b/external/flux/flux-core/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.storm
 flux
-0.10.0
+0.10.1-SNAPSHOT
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/12268635/external/flux/flux-examples/pom.xml
--
diff --git a/external/flux/flux-examples/pom.xml 
b/external/flux/flux-examples/pom.xml
index d7543ac..4e8d67d 100644
--- a/external/flux/flux-examples/pom.xml
+++ b/external/flux/flux-examples/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.storm
 flux
-0.10.0
+0.10.1-SNAPSHOT
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/12268635/external/flux/flux-wrappers/pom.xml
--
diff --git a/external/flux/flux-wrappers/pom.xml 
b/external/flux/flux-wrappers/pom.xml
index 6ff542e..9b60526 100644
--- a/external/flux/flux-wrappers/pom.xml
+++ b/external/flux/flux-wrappers/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.storm
 flux
-0.10.0
+0.10.1-SNAPSHOT
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/12268635/external/flux/pom.xml
--
diff --git a/external/flux/pom.xml b/external/flux/pom.xml
index 96840d7..cd356cf 100644
--- a/external/flux/pom.xml
+++ b/external/flux/pom.xml
@@ -26,7 +26,7 @@
 
 storm
 org.apache.storm
-0.10.0
+0.10.1-SNAPSHOT
 ../../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/12268635/external/storm-eventhubs/pom.xml
--
diff --git a/external/storm-eventhubs/pom.xml b/external/storm-eventhubs/pom.xml
index a14f1a6..b036fec 100755
--- a/external/storm-eventhubs/pom.xml
+++ b/external/storm-eventhubs/pom.xml
@@ -21,7

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

2015-10-23 Thread ptgoetz 
Repository: storm
Updated Branches:
  refs/heads/0.10.x-branch bc5f38ef6 -> df8ad6109


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

This reverts commit e10059088db7edeee3cfa86d7fbf7c6a31e1deb8.


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

Branch: refs/heads/0.10.x-branch
Commit: db2026b24f290755b271c12554a038adcbd2a779
Parents: bc5f38e
Author: P. Taylor Goetz 
Authored: Fri Oct 23 11:03:09 2015 -0400
Committer: P. Taylor Goetz 
Committed: Fri Oct 23 11:03:09 2015 -0400

--
 examples/storm-starter/pom.xml   | 2 +-
 external/flux/flux-core/pom.xml  | 2 +-
 external/flux/flux-examples/pom.xml  | 2 +-
 external/flux/flux-wrappers/pom.xml  | 2 +-
 external/flux/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-kafka/pom.xml | 2 +-
 external/storm-redis/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 +-
 21 files changed, 22 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/db2026b2/examples/storm-starter/pom.xml
--
diff --git a/examples/storm-starter/pom.xml b/examples/storm-starter/pom.xml
index f524062..eccbb29 100644
--- a/examples/storm-starter/pom.xml
+++ b/examples/storm-starter/pom.xml
@@ -20,7 +20,7 @@
   
   storm
   org.apache.storm
-  0.10.1-SNAPSHOT
+  0.10.0
   ../../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/storm/blob/db2026b2/external/flux/flux-core/pom.xml
--
diff --git a/external/flux/flux-core/pom.xml b/external/flux/flux-core/pom.xml
index 90f9e6a..e852a2a 100644
--- a/external/flux/flux-core/pom.xml
+++ b/external/flux/flux-core/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.storm
 flux
-0.10.1-SNAPSHOT
+0.10.0
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/db2026b2/external/flux/flux-examples/pom.xml
--
diff --git a/external/flux/flux-examples/pom.xml 
b/external/flux/flux-examples/pom.xml
index 4e8d67d..d7543ac 100644
--- a/external/flux/flux-examples/pom.xml
+++ b/external/flux/flux-examples/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.storm
 flux
-0.10.1-SNAPSHOT
+0.10.0
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/db2026b2/external/flux/flux-wrappers/pom.xml
--
diff --git a/external/flux/flux-wrappers/pom.xml 
b/external/flux/flux-wrappers/pom.xml
index 9b60526..6ff542e 100644
--- a/external/flux/flux-wrappers/pom.xml
+++ b/external/flux/flux-wrappers/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.storm
 flux
-0.10.1-SNAPSHOT
+0.10.0
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/db2026b2/external/flux/pom.xml
--
diff --git a/external/flux/pom.xml b/external/flux/pom.xml
index cd356cf..96840d7 100644
--- a/external/flux/pom.xml
+++ b/external/flux/pom.xml
@@ -26,7 +26,7 @@
 
 storm
 org.apache.storm
-0.10.1-SNAPSHOT
+0.10.0
 ../../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/db2026b2/external/storm-eventhubs/pom.xml
--
diff --git a/external/storm-eventhubs/pom.xml b/external/storm-eventhubs/pom.xml
index b036fec..a14f1a6 100755
---

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

2015-10-23 Thread ptgoetz 
Revert "[maven-release-plugin] prepare release v0.10.0"

This reverts commit f6c0abb0bd76867b48c7b7c7cfdfdc7e0e6f483a.


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

Branch: refs/heads/0.10.x-branch
Commit: df8ad610977fb3a25c4ff90ebeb9d56a6a724da7
Parents: db2026b
Author: P. Taylor Goetz 
Authored: Fri Oct 23 11:03:13 2015 -0400
Committer: P. Taylor Goetz 
Committed: Fri Oct 23 11:03:13 2015 -0400

--
 examples/storm-starter/pom.xml   | 2 +-
 external/flux/flux-core/pom.xml  | 2 +-
 external/flux/flux-examples/pom.xml  | 2 +-
 external/flux/flux-wrappers/pom.xml  | 2 +-
 external/flux/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-kafka/pom.xml | 2 +-
 external/storm-redis/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 +-
 21 files changed, 22 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/df8ad610/examples/storm-starter/pom.xml
--
diff --git a/examples/storm-starter/pom.xml b/examples/storm-starter/pom.xml
index eccbb29..32ea2e1 100644
--- a/examples/storm-starter/pom.xml
+++ b/examples/storm-starter/pom.xml
@@ -20,7 +20,7 @@
   
   storm
   org.apache.storm
-  0.10.0
+  0.10.0-beta2-SNAPSHOT
   ../../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/storm/blob/df8ad610/external/flux/flux-core/pom.xml
--
diff --git a/external/flux/flux-core/pom.xml b/external/flux/flux-core/pom.xml
index e852a2a..0e56bc7 100644
--- a/external/flux/flux-core/pom.xml
+++ b/external/flux/flux-core/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.storm
 flux
-0.10.0
+0.10.0-beta2-SNAPSHOT
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/df8ad610/external/flux/flux-examples/pom.xml
--
diff --git a/external/flux/flux-examples/pom.xml 
b/external/flux/flux-examples/pom.xml
index d7543ac..9a46b5b 100644
--- a/external/flux/flux-examples/pom.xml
+++ b/external/flux/flux-examples/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.storm
 flux
-0.10.0
+0.10.0-beta2-SNAPSHOT
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/df8ad610/external/flux/flux-wrappers/pom.xml
--
diff --git a/external/flux/flux-wrappers/pom.xml 
b/external/flux/flux-wrappers/pom.xml
index 6ff542e..995ef79 100644
--- a/external/flux/flux-wrappers/pom.xml
+++ b/external/flux/flux-wrappers/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.storm
 flux
-0.10.0
+0.10.0-beta2-SNAPSHOT
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/df8ad610/external/flux/pom.xml
--
diff --git a/external/flux/pom.xml b/external/flux/pom.xml
index 96840d7..6ab8a92 100644
--- a/external/flux/pom.xml
+++ b/external/flux/pom.xml
@@ -26,7 +26,7 @@
 
 storm
 org.apache.storm
-0.10.0
+0.10.0-beta2-SNAPSHOT
 ../../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/df8ad610/external/storm-eventhubs/pom.xml
--
diff --git a/external/storm-eventhubs/pom.xml b/external/storm-eventhubs/pom.xml
index a14f1a6..630fc75 100755
--- a/external/storm-eventhubs/pom.xml
+++ b/external/storm-eventhubs/pom.xml
@@ -21,7

[2/3] storm git commit: Merge branch '1122' of https://github.com/zhuoliu/storm into STORM-1122

2015-10-23 Thread kabhwan 
Merge branch '1122' of https://github.com/zhuoliu/storm into STORM-1122


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

Branch: refs/heads/master
Commit: 6177ae4f8cb3f6b71cf7457ace249f11946bcacb
Parents: ff3b8af 8161bea
Author: Jungtaek Lim 
Authored: Sat Oct 24 10:39:56 2015 +0900
Committer: Jungtaek Lim 
Committed: Sat Oct 24 10:39:56 2015 +0900

--
 .../src/jvm/backtype/storm/utils/Utils.java | 262 ++-
 1 file changed, 132 insertions(+), 130 deletions(-)
--

[1/3] storm git commit: [STORM-1122] Fix the format issue in Utils.java

2015-10-23 Thread kabhwan 
Repository: storm
Updated Branches:
  refs/heads/master ff3b8affa -> e93015c64


[STORM-1122] Fix the format issue in Utils.java


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

Branch: refs/heads/master
Commit: 8161beab46b5d489aa37db524b980c1676dd08fe
Parents: b0f3be0
Author: zhuol 
Authored: Thu Oct 22 12:43:37 2015 -0500
Committer: zhuol 
Committed: Thu Oct 22 12:49:36 2015 -0500

--
 .../src/jvm/backtype/storm/utils/Utils.java | 262 ++-
 1 file changed, 132 insertions(+), 130 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/8161beab/storm-core/src/jvm/backtype/storm/utils/Utils.java
--
diff --git a/storm-core/src/jvm/backtype/storm/utils/Utils.java 
b/storm-core/src/jvm/backtype/storm/utils/Utils.java
index 7f02b56..c852306 100644
--- a/storm-core/src/jvm/backtype/storm/utils/Utils.java
+++ b/storm-core/src/jvm/backtype/storm/utils/Utils.java
@@ -40,7 +40,6 @@ import org.slf4j.LoggerFactory;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.SafeConstructor;
 
-import java.io.*;
 import java.net.URL;
 import java.net.URLDecoder;
 import java.nio.ByteBuffer;
@@ -48,7 +47,26 @@ import java.nio.channels.Channels;
 import java.nio.channels.WritableByteChannel;
 import java.io.File;
 import java.io.FileInputStream;
-import java.util.*;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.OutputStreamWriter;
+import java.io.InputStreamReader;
+import java.io.InputStream;
+import java.io.FileOutputStream;
+import java.io.BufferedReader;
+import java.io.Serializable;
+import java.io.IOException;
+import java.util.Map;
+import java.util.Iterator;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.TreeMap;
+import java.util.UUID;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
@@ -99,9 +117,9 @@ public class Utils {
 Object ret = ois.readObject();
 ois.close();
 return (T)ret;
-} catch(IOException ioe) {
+} catch (IOException ioe) {
 throw new RuntimeException(ioe);
-} catch(ClassNotFoundException e) {
+} catch (ClassNotFoundException e) {
 throw new RuntimeException(e);
 }
 }
@@ -155,9 +173,9 @@ public class Utils {
 Object ret = JSONValue.parseWithException(in);
 in.close();
 return (Map)ret;
-} catch(IOException ioe) {
+} catch (IOException ioe) {
 throw new RuntimeException(ioe);
-} catch(ParseException e) {
+} catch (ParseException e) {
 throw new RuntimeException(e);
 }
 }
@@ -186,7 +204,7 @@ public class Utils {
 try {
 Enumeration resources = 
Thread.currentThread().getContextClassLoader().getResources(name);
 List ret = new ArrayList();
-while(resources.hasMoreElements()) {
+while (resources.hasMoreElements()) {
 ret.add(resources.nextElement());
 }
 return ret;
@@ -259,7 +277,7 @@ public class Utils {
 
 
 public static Map findAndReadConfigFile(String name) {
-   return findAndReadConfigFile(name, true);
+return findAndReadConfigFile(name, true);
 }
 
 public static Map readDefaultConfig() {
@@ -269,7 +287,7 @@ public class Utils {
 public static Map readCommandLineOpts() {
 Map ret = new HashMap();
 String commandOptions = System.getProperty("storm.options");
-if(commandOptions != null) {
+if (commandOptions != null) {
 String[] configs = commandOptions.split(",");
 for (String config : configs) {
 config = URLDecoder.decode(config);
@@ -292,7 +310,7 @@ public class Utils {
 Map ret = readDefaultConfig();
 String confFile = System.getProperty("storm.conf.file");
 Map storm;
-if (confFile==null || confFile.equals("")) {
+if (confFile == null || confFile.equals("")) {
 storm = findAndReadConfigFile("storm.yaml", false);
 } else {
 storm = findAndReadConfigFile(confFile, true);
@@ -303,24 +321,24 @@ public class Utils {
 }
 
 private static Object normalizeConf(Object conf) {
-if(conf==null) return new HashMap();
-if(conf instanceof Map) {
+

[3/3] storm git commit: add STORM-1122 to CHANGELOG.md

2015-10-23 Thread kabhwan 
add STORM-1122 to CHANGELOG.md


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

Branch: refs/heads/master
Commit: e93015c642267484cc65fa7c0a3c205f90673f14
Parents: 6177ae4
Author: Jungtaek Lim 
Authored: Sat Oct 24 11:55:42 2015 +0900
Committer: Jungtaek Lim 
Committed: Sat Oct 24 11:55:42 2015 +0900

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


http://git-wip-us.apache.org/repos/asf/storm/blob/e93015c6/CHANGELOG.md
--
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8adfa0e..431148a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 0.11.0
+ * STORM-1122: Fix the format issue in Utils.java
  * STORM-: Fix Validation for lots of different configs
  * STORM-1125: Adding separate ZK client for read in Nimbus ZK State
  * STORM-1121: Remove method call to avoid overhead during topology submission 
time

svn commit: r10895 - /dev/storm/apache-storm-0.10.0/

2015-10-23 Thread ptgoetz 
Author: ptgoetz
Date: Fri Oct 23 20:12:03 2015
New Revision: 10895

Log:
stage 0.10.0 rc1 artifacts

Added:
dev/storm/apache-storm-0.10.0/
dev/storm/apache-storm-0.10.0/apache-storm-0.10.0-src.tar.gz   (with props)
dev/storm/apache-storm-0.10.0/apache-storm-0.10.0-src.tar.gz.asc
dev/storm/apache-storm-0.10.0/apache-storm-0.10.0-src.tar.gz.md5
dev/storm/apache-storm-0.10.0/apache-storm-0.10.0-src.tar.gz.sha
dev/storm/apache-storm-0.10.0/apache-storm-0.10.0-src.zip   (with props)
dev/storm/apache-storm-0.10.0/apache-storm-0.10.0-src.zip.asc
dev/storm/apache-storm-0.10.0/apache-storm-0.10.0-src.zip.md5
dev/storm/apache-storm-0.10.0/apache-storm-0.10.0-src.zip.sha
dev/storm/apache-storm-0.10.0/apache-storm-0.10.0.tar.gz   (with props)
dev/storm/apache-storm-0.10.0/apache-storm-0.10.0.tar.gz.asc
dev/storm/apache-storm-0.10.0/apache-storm-0.10.0.tar.gz.md5
dev/storm/apache-storm-0.10.0/apache-storm-0.10.0.tar.gz.sha
dev/storm/apache-storm-0.10.0/apache-storm-0.10.0.zip   (with props)
dev/storm/apache-storm-0.10.0/apache-storm-0.10.0.zip.asc
dev/storm/apache-storm-0.10.0/apache-storm-0.10.0.zip.md5
dev/storm/apache-storm-0.10.0/apache-storm-0.10.0.zip.sha

Added: dev/storm/apache-storm-0.10.0/apache-storm-0.10.0-src.tar.gz
==
Binary file - no diff available.

Propchange: dev/storm/apache-storm-0.10.0/apache-storm-0.10.0-src.tar.gz
--
svn:mime-type = application/octet-stream

Added: dev/storm/apache-storm-0.10.0/apache-storm-0.10.0-src.tar.gz.asc
==
--- dev/storm/apache-storm-0.10.0/apache-storm-0.10.0-src.tar.gz.asc (added)
+++ dev/storm/apache-storm-0.10.0/apache-storm-0.10.0-src.tar.gz.asc Fri Oct 23 
20:12:03 2015
@@ -0,0 +1,11 @@
+-BEGIN PGP SIGNATURE-
+Comment: GPGTools - https://gpgtools.org
+
+iQEcBAABCgAGBQJWKo4CAAoJEI3gOWLoC4/9odcIALAAmCsQltT4zmMZwAhUQVe9
+HXYu2jJX5fQBAfRFty6p7jhMmNwwIfOQX1b9fcvGwBi1KL+cyweKn4sbDroqdRJX
+JvR3nEmBO8GZrJEcxcM8vq2yD5JixsEETrf+vzFsjZeanjYwOqwTCRluz56fHSPS
+AmnKSV8VGg6zbAl7/KAY75mILq0gS8/1lEZFla5M9nRw43UAO0jhuK50TkRPZIrO
+QbG//Lybi57Bo26QoLTQIeOjSoJrXZXuHTfMs70+tNDOoVicrLjPjoMpVVrKJ5dq
+4se53RPp6Vu+bYIjD7zKk5ys9rcerQ/hxBnOmJDD1ex/DYwH1GUhvUEInoNoaDE=
+=wQfg
+-END PGP SIGNATURE-

Added: dev/storm/apache-storm-0.10.0/apache-storm-0.10.0-src.tar.gz.md5
==
--- dev/storm/apache-storm-0.10.0/apache-storm-0.10.0-src.tar.gz.md5 (added)
+++ dev/storm/apache-storm-0.10.0/apache-storm-0.10.0-src.tar.gz.md5 Fri Oct 23 
20:12:03 2015
@@ -0,0 +1 @@
+apache-storm-0.10.0-src.tar.gz: 2C CD 31 39 B8 3B 6B 27  9C 95 F8 A9 AF 3F 91 
E1

Added: dev/storm/apache-storm-0.10.0/apache-storm-0.10.0-src.tar.gz.sha
==
--- dev/storm/apache-storm-0.10.0/apache-storm-0.10.0-src.tar.gz.sha (added)
+++ dev/storm/apache-storm-0.10.0/apache-storm-0.10.0-src.tar.gz.sha Fri Oct 23 
20:12:03 2015
@@ -0,0 +1,4 @@
+apache-storm-0.10.0-src.tar.gz: 14BC2C83 190017B6 76A03095 FE17BC33 019F606C
+AE8CAAC4 021A7152 F5473977 DD49B33F E4C1A678
+CD99863D E20B43CC E87D505D E74E61F5 3DD67E01
+2C9BF7F4

Added: dev/storm/apache-storm-0.10.0/apache-storm-0.10.0-src.zip
==
Binary file - no diff available.

Propchange: dev/storm/apache-storm-0.10.0/apache-storm-0.10.0-src.zip
--
svn:mime-type = application/octet-stream

Added: dev/storm/apache-storm-0.10.0/apache-storm-0.10.0-src.zip.asc
==
--- dev/storm/apache-storm-0.10.0/apache-storm-0.10.0-src.zip.asc (added)
+++ dev/storm/apache-storm-0.10.0/apache-storm-0.10.0-src.zip.asc Fri Oct 23 
20:12:03 2015
@@ -0,0 +1,11 @@
+-BEGIN PGP SIGNATURE-
+Comment: GPGTools - https://gpgtools.org
+
+iQEcBAABCgAGBQJWKo4CAAoJEI3gOWLoC4/9IRUIAMOVsJNwadEaiL/tAshAkDtM
+RytrSNuw7rDhPHLXAxjwPo5y8Or/uQf8CmQbA31jorcYiI8saoeJ2hJy+ZjMVOlB
+vR4LUpu9WRoUPlN76k9oyfUHH9Rs/adbQUhR0Pj5lmZ5FPoK6tIYscy9wFIQskBi
+H3uWhmrBetUbyFW+PuC6NlkRrkNhVbKr84M6cUA/TBg7ybChMknusdK6JK3lFuT8
+MT6yWtuld8uLoJe3L6ZvxFR1OUpuHnxLr+hzxvyK7Tk/e3RSteBpMn66UHn/L0RS
+CP0BHrfxIkapj7ZA/TFWJJbcBvrsJr9WBwbysIMUqmZNFjuE/5ek739c2BSVAMA=
+=wpdR
+-END PGP SIGNATURE-

Added: dev/storm/apache-storm-0.10.0/apache-storm-0.10.0-src.zip.md5
==
--- dev/storm/apache-storm-0.10.0/apache-storm-0.10.0-src.zip.md5 (added)
+++

[7/7] storm git commit: add STORM-1121 to CHANGELOG.md

2015-10-23 Thread kabhwan 
add STORM-1121 to CHANGELOG.md


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

Branch: refs/heads/master
Commit: 8c3fc5590709c21c4f21598d396e16309c917592
Parents: fd7cadd
Author: Jungtaek Lim 
Authored: Sat Oct 24 10:02:58 2015 +0900
Committer: Jungtaek Lim 
Committed: Sat Oct 24 10:02:58 2015 +0900

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


http://git-wip-us.apache.org/repos/asf/storm/blob/8c3fc559/CHANGELOG.md
--
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cae333f..08dbf45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 0.11.0
+ * STORM-1121: Remove method call to avoid overhead during topology submission 
time
  * STORM-1120: Fix keyword (schema -> scheme) from main-routes
  * STORM-1115: Stale leader-lock key effectively bans all nodes from becoming 
leaders
  * STORM-1119: Create access logging for all daemons

[6/7] storm git commit: Merge branch 'STORM-1121' of https://github.com/kishorvpatil/incubator-storm into STORM-1121

2015-10-23 Thread kabhwan 
Merge branch 'STORM-1121' of https://github.com/kishorvpatil/incubator-storm 
into STORM-1121


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

Branch: refs/heads/master
Commit: fd7cadd0282d40b2e20506a4295daf29dcc23e0a
Parents: 9de7922 404bb6a
Author: Jungtaek Lim 
Authored: Sat Oct 24 10:02:28 2015 +0900
Committer: Jungtaek Lim 
Committed: Sat Oct 24 10:02:28 2015 +0900

--
 conf/defaults.yaml  |  1 -
 storm-core/src/clj/backtype/storm/config.clj|  1 +
 .../src/clj/backtype/storm/daemon/nimbus.clj|  5 +--
 storm-core/src/clj/backtype/storm/testing.clj   |  3 +-
 storm-core/src/jvm/backtype/storm/Config.java   |  7 ---
 .../clj/backtype/storm/integration_test.clj |  8 +++-
 .../test/clj/backtype/storm/multilang_test.clj  |  4 +-
 .../test/clj/backtype/storm/nimbus_test.clj | 45 ++--
 .../test/clj/backtype/storm/supervisor_test.clj | 15 +--
 .../test/clj/backtype/storm/testing4j_test.clj  |  1 +
 .../clj/backtype/storm/transactional_test.clj   |  5 ++-
 11 files changed, 60 insertions(+), 35 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/fd7cadd0/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
--

[5/7] storm git commit: Remove nimbus.reassign config and make it unavialble to users

2015-10-23 Thread kabhwan 
Remove nimbus.reassign config and make it unavialble to users


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

Branch: refs/heads/master
Commit: 404bb6acab26e3c58644c2ccf75b3abe601f40bf
Parents: ce5dd66
Author: Kishor Patil 
Authored: Fri Oct 23 19:45:29 2015 -0500
Committer: Kishor Patil 
Committed: Fri Oct 23 19:45:29 2015 -0500

--
 conf/defaults.yaml | 1 -
 storm-core/src/clj/backtype/storm/config.clj   | 1 +
 storm-core/src/clj/backtype/storm/daemon/nimbus.clj| 2 +-
 storm-core/src/jvm/backtype/storm/Config.java  | 7 ---
 storm-core/test/clj/backtype/storm/supervisor_test.clj | 6 +++---
 5 files changed, 5 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/404bb6ac/conf/defaults.yaml
--
diff --git a/conf/defaults.yaml b/conf/defaults.yaml
index dae8773..7166bd4 100644
--- a/conf/defaults.yaml
+++ b/conf/defaults.yaml
@@ -65,7 +65,6 @@ nimbus.cleanup.inbox.freq.secs: 600
 nimbus.inbox.jar.expiration.secs: 3600
 nimbus.code.sync.freq.secs: 300
 nimbus.task.launch.secs: 120
-nimbus.reassign: true
 nimbus.file.copy.expiration.secs: 600
 nimbus.topology.validator: "backtype.storm.nimbus.DefaultTopologyValidator"
 topology.min.replication.count: 1

http://git-wip-us.apache.org/repos/asf/storm/blob/404bb6ac/storm-core/src/clj/backtype/storm/config.clj
--
diff --git a/storm-core/src/clj/backtype/storm/config.clj 
b/storm-core/src/clj/backtype/storm/config.clj
index 0d4f1e6..e1cafec 100644
--- a/storm-core/src/clj/backtype/storm/config.clj
+++ b/storm-core/src/clj/backtype/storm/config.clj
@@ -25,6 +25,7 @@
   (:use [backtype.storm log util]))
 
 (def RESOURCES-SUBDIR "resources")
+(def NIMBUS-DO-NOT-REASSIGN "NIMBUS-DO-NOT-REASSIGN")
 
 (defn- clojure-config-name [name]
   (.replace (.toUpperCase name) "_" "-"))

http://git-wip-us.apache.org/repos/asf/storm/blob/404bb6ac/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
--
diff --git a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj 
b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
index 4bf49b9..1110614 100644
--- a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
@@ -1166,7 +1166,7 @@
 0
 (conf NIMBUS-MONITOR-FREQ-SECS)
 (fn []
-  (when (conf NIMBUS-REASSIGN)
+  (when-not (conf NIMBUS-DO-NOT-REASSIGN)
 (locking (:submit-lock nimbus)
   (mk-assignments nimbus)))
   (do-cleanup nimbus)

http://git-wip-us.apache.org/repos/asf/storm/blob/404bb6ac/storm-core/src/jvm/backtype/storm/Config.java
--
diff --git a/storm-core/src/jvm/backtype/storm/Config.java 
b/storm-core/src/jvm/backtype/storm/Config.java
index c2ed719..810d5f4 100644
--- a/storm-core/src/jvm/backtype/storm/Config.java
+++ b/storm-core/src/jvm/backtype/storm/Config.java
@@ -470,13 +470,6 @@ public class Config extends HashMap {
 public static final String NIMBUS_TASK_LAUNCH_SECS = 
"nimbus.task.launch.secs";
 
 /**
- * Whether or not nimbus should reassign tasks if it detects that a task 
goes down.
- * Defaults to true, and it's not recommended to change this value.
- */
-@isBoolean
-public static final String NIMBUS_REASSIGN = "nimbus.reassign";
-
-/**
  * During upload/download with the master, how long an upload or download 
connection is idle
  * before nimbus considers it dead and drops the connection.
  */

http://git-wip-us.apache.org/repos/asf/storm/blob/404bb6ac/storm-core/test/clj/backtype/storm/supervisor_test.clj
--
diff --git a/storm-core/test/clj/backtype/storm/supervisor_test.clj 
b/storm-core/test/clj/backtype/storm/supervisor_test.clj
index 57d4cc2..fab401a 100644
--- a/storm-core/test/clj/backtype/storm/supervisor_test.clj
+++ b/storm-core/test/clj/backtype/storm/supervisor_test.clj
@@ -75,7 +75,7 @@
 
 (deftest launches-assignment
   (with-simulated-time-local-cluster [cluster :supervisors 0
-:daemon-conf {NIMBUS-REASSIGN false
+:daemon-conf {NIMBUS-DO-NOT-REASSIGN true
   SUPERVISOR-WORKER-START-TIMEOUT-SECS 5

[2/7] storm git commit: Lowering test time with rebalance/sleep .

2015-10-23 Thread kabhwan 
Lowering test time with rebalance/sleep .


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

Branch: refs/heads/master
Commit: f9c41e31cdd7a04f982bdfb1f25d330fa1340d47
Parents: 1593a37
Author: Kishor Patil 
Authored: Wed Oct 21 22:32:53 2015 +
Committer: Kishor Patil 
Committed: Wed Oct 21 23:04:22 2015 +

--
 .../clj/backtype/storm/integration_test.clj | 20 +++-
 .../test/clj/backtype/storm/nimbus_test.clj | 24 +++-
 .../test/clj/backtype/storm/supervisor_test.clj |  4 
 .../test/clj/backtype/storm/testing4j_test.clj  |  5 
 .../clj/backtype/storm/transactional_test.clj   | 12 --
 5 files changed, 51 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/f9c41e31/storm-core/test/clj/backtype/storm/integration_test.clj
--
diff --git a/storm-core/test/clj/backtype/storm/integration_test.clj 
b/storm-core/test/clj/backtype/storm/integration_test.clj
index 3380536..4a8b946 100644
--- a/storm-core/test/clj/backtype/storm/integration_test.clj
+++ b/storm-core/test/clj/backtype/storm/integration_test.clj
@@ -17,7 +17,7 @@
   (:use [clojure test])
   (:import [backtype.storm Config])
   (:import [backtype.storm.topology TopologyBuilder])
-  (:import [backtype.storm.generated InvalidTopologyException SubmitOptions 
TopologyInitialStatus])
+  (:import [backtype.storm.generated InvalidTopologyException SubmitOptions 
TopologyInitialStatus RebalanceOptions])
   (:import [backtype.storm.testing TestWordCounter TestWordSpout 
TestGlobalCount
 TestAggregatesCounter TestConfBolt AckFailMapTracker AckTracker 
TestPlannerSpout])
   (:import [backtype.storm.tuple Fields])
@@ -237,7 +237,9 @@
  "acking-test1"
  {}
  (:topology tracked))
-  (Thread/sleep 11000)
+  ;; Instead of sleeping until topology is scheduled, rebalance topology 
so mk-assignments is called.
+  (.rebalance (:nimbus cluster)
+ "acking-test1" (doto (RebalanceOptions.) 
(.set_wait_secs 0)))
   (.feed feeder1 [1])
   (tracked-wait tracked 1)
   (checker1 0)
@@ -280,7 +282,9 @@
  "test-acking2"
  {}
  (:topology tracked))
-  (Thread/sleep 11000)
+  ;; Instead of sleeping until topology is scheduled, rebalance topology 
so mk-assignments is called.
+  (.rebalance (:nimbus cluster)
+ "test-acking2" (doto (RebalanceOptions.) 
(.set_wait_secs 0)))
   (.feed feeder [1])
   (tracked-wait tracked 1)
   (checker 0)
@@ -326,7 +330,7 @@
 {TOPOLOGY-MESSAGE-TIMEOUT-SECS 10}
 topology
 (SubmitOptions. TopologyInitialStatus/INACTIVE))
-  (Thread/sleep 11000)
+  (advance-cluster-time cluster 11)
   (.feed feeder ["a"] 1)
   (advance-cluster-time cluster 9)
   (is (not @bolt-prepared?))
@@ -351,7 +355,9 @@
  "test"
  {}
  (:topology tracked))
-  (Thread/sleep 11000)
+  ;; Instead of sleeping until topology is scheduled, rebalance topology 
so mk-assignments is called.
+  (.rebalance (:nimbus cluster)
+ "test" (doto (RebalanceOptions.) (.set_wait_secs 
0)))
   (.feed feeder [1])
   (tracked-wait tracked 1)
   (checker 1)
@@ -573,7 +579,9 @@
   TOPOLOGY-DEBUG true
   }
  (:topology tracked))
-_ (advance-cluster-time cluster 11)
+;; Instead of sleeping until topology is scheduled, rebalance 
topology so mk-assignments is called.
+_ (.rebalance (:nimbus cluster)
+ "test-errors" (doto 
(RebalanceOptions.) (.set_wait_secs 0)))
 storm-id (get-storm-id state "test-errors")
 errors-count (fn [] (count (.errors state storm-id "2")))]
 

http://git-wip-us.apache.org/repos/asf/storm/blob/f9c41e31/storm-core/test/clj/backtype/storm/nimbus_test.clj
--
diff --git a/storm-core/test/clj/backtype/storm/nimbus_test.clj 
b/storm-core/test/clj/backtype/storm/nimbus_test.clj
index f84bc9f..0b36e51 100644
--- a/storm-core/test/clj/backtype/storm/nimbus_test.clj
+++

[1/7] storm git commit: Remove method call to avoid overhead during topology submission time

2015-10-23 Thread kabhwan 
Repository: storm
Updated Branches:
  refs/heads/master 9de79225c -> 8c3fc5590


Remove method call to avoid overhead during topology submission time


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

Branch: refs/heads/master
Commit: 1593a374a4a381238f39fd9b0d078586d1aaa305
Parents: d23bd3e
Author: Kishor Patil 
Authored: Mon Oct 19 23:32:18 2015 +
Committer: Kishor Patil 
Committed: Wed Oct 21 12:18:30 2015 -0500

--
 .../src/clj/backtype/storm/daemon/nimbus.clj|  3 +-
 storm-core/src/clj/backtype/storm/testing.clj   |  1 +
 .../clj/backtype/storm/integration_test.clj |  6 
 .../test/clj/backtype/storm/multilang_test.clj  |  4 +--
 .../test/clj/backtype/storm/nimbus_test.clj | 35 ++--
 .../test/clj/backtype/storm/supervisor_test.clj |  5 ++-
 .../clj/backtype/storm/transactional_test.clj   |  2 ++
 7 files changed, 41 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/1593a374/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
--
diff --git a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj 
b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
index 2b0a9b5..4bf49b9 100644
--- a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
@@ -1263,8 +1263,7 @@
   (.setup-backpressure! storm-cluster-state storm-id)
   (let [thrift-status->kw-status {TopologyInitialStatus/INACTIVE 
:inactive
   TopologyInitialStatus/ACTIVE 
:active}]
-(start-storm nimbus storm-name storm-id 
(thrift-status->kw-status (.get_initial_status submitOptions
-  (mk-assignments nimbus)))
+(start-storm nimbus storm-name storm-id 
(thrift-status->kw-status (.get_initial_status submitOptions))
   (catch Throwable e
 (log-warn-error e "Topology submission exception. (topology 
name='" storm-name "')")
 (throw e

http://git-wip-us.apache.org/repos/asf/storm/blob/1593a374/storm-core/src/clj/backtype/storm/testing.clj
--
diff --git a/storm-core/src/clj/backtype/storm/testing.clj 
b/storm-core/src/clj/backtype/storm/testing.clj
index ca43195..56df2ec 100644
--- a/storm-core/src/clj/backtype/storm/testing.clj
+++ b/storm-core/src/clj/backtype/storm/testing.clj
@@ -515,6 +515,7 @@
   (startup spout))
 
 (submit-local-topology (:nimbus cluster-map) storm-name storm-conf 
topology)
+(advance-cluster-time cluster-map 11)
 
 (let [storm-id (common/get-storm-id state storm-name)]
   ;;Give the topology time to come up without using it to wait for the 
spouts to complete

http://git-wip-us.apache.org/repos/asf/storm/blob/1593a374/storm-core/test/clj/backtype/storm/integration_test.clj
--
diff --git a/storm-core/test/clj/backtype/storm/integration_test.clj 
b/storm-core/test/clj/backtype/storm/integration_test.clj
index 712b195..3380536 100644
--- a/storm-core/test/clj/backtype/storm/integration_test.clj
+++ b/storm-core/test/clj/backtype/storm/integration_test.clj
@@ -105,6 +105,7 @@
  "timeout-tester"
  {TOPOLOGY-MESSAGE-TIMEOUT-SECS 10}
  topology)
+  (advance-cluster-time cluster 11)
   (.feed feeder ["a"] 1)
   (.feed feeder ["b"] 2)
   (.feed feeder ["c"] 3)
@@ -236,6 +237,7 @@
  "acking-test1"
  {}
  (:topology tracked))
+  (Thread/sleep 11000)
   (.feed feeder1 [1])
   (tracked-wait tracked 1)
   (checker1 0)
@@ -278,6 +280,7 @@
  "test-acking2"
  {}
  (:topology tracked))
+  (Thread/sleep 11000)
   (.feed feeder [1])
   (tracked-wait tracked 1)
   (checker 0)
@@ -323,6 +326,7 @@
 {TOPOLOGY-MESSAGE-TIMEOUT-SECS 10}
 topology
 (SubmitOptions. TopologyInitialStatus/INACTIVE))
+  (Thread/sleep 11000)
   (.feed feeder ["a"] 1)
   (advance-cluster-time cluster 9)
   (is (not @bolt-prepared?))
@@ -347,6 +351,7 @@
  "test"
  {}
  (:topology tracked))
+  (Thread/sleep 11000)
   (.feed feeder [1])
   (tracked-wait tracked 1)
   (checker

[2/4] storm git commit: Flag for separating zk reader connection in cluster state

2015-10-23 Thread kabhwan 
Flag for separating zk reader connection in cluster state


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

Branch: refs/heads/master
Commit: 9ad277490e26145ad5250c010aa42ef0ca2e3e07
Parents: 0d8a2fa
Author: Kishor Patil 
Authored: Fri Oct 23 19:34:58 2015 +
Committer: Kishor Patil 
Committed: Fri Oct 23 19:34:58 2015 +

--
 storm-core/src/clj/backtype/storm/cluster.clj   | 14 +-
 storm-core/src/clj/backtype/storm/daemon/nimbus.clj |  2 +-
 2 files changed, 6 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/9ad27749/storm-core/src/clj/backtype/storm/cluster.clj
--
diff --git a/storm-core/src/clj/backtype/storm/cluster.clj 
b/storm-core/src/clj/backtype/storm/cluster.clj
index 9057267..5c10a1c 100644
--- a/storm-core/src/clj/backtype/storm/cluster.clj
+++ b/storm-core/src/clj/backtype/storm/cluster.clj
@@ -55,12 +55,8 @@
   [(first ZooDefs$Ids/CREATOR_ALL_ACL)
(ACL. ZooDefs$Perms/READ (Id. "digest" 
(DigestAuthenticationProvider/generateDigest payload)))])))
  
-(defn is-nimbus?
-  []
-  (= (System/getProperty "daemon.name") "nimbus"))
-
 (defnk mk-distributed-cluster-state
-  [conf :auth-conf nil :acls nil]
+  [conf :auth-conf nil :acls nil :separate-zk-writer? false]
   (let [zk (zk/mk-client conf (conf STORM-ZOOKEEPER-SERVERS) (conf 
STORM-ZOOKEEPER-PORT) :auth-conf auth-conf)]
 (zk/mkdirs zk (conf STORM-ZOOKEEPER-ROOT) acls)
 (.close zk))
@@ -78,7 +74,7 @@
   (when-not (= :none type)
 (doseq [callback (vals @callbacks)]
   (callback type path))
-zk-reader (if (is-nimbus?)
+zk-reader (if separate-zk-writer?
 (zk/mk-client conf
  (conf STORM-ZOOKEEPER-SERVERS)
  (conf STORM-ZOOKEEPER-PORT)
@@ -161,7 +157,7 @@
[this]
(reset! active false)
(.close zk-writer)
-   (if (is-nimbus?) (.close zk-reader)))
+   (if separate-zk-writer? (.close zk-reader)))
 
   (add-listener
 [this listener]
@@ -346,10 +342,10 @@
 
 ;; Watches should be used for optimization. When ZK is reconnecting, they're 
not guaranteed to be called.
 (defnk mk-storm-cluster-state
-  [cluster-state-spec :acls nil]
+  [cluster-state-spec :acls nil :separate-zk-writer? false]
   (let [[solo? cluster-state] (if (satisfies? ClusterState cluster-state-spec)
 [false cluster-state-spec]
-[true (mk-distributed-cluster-state 
cluster-state-spec :auth-conf cluster-state-spec :acls acls)])
+[true (mk-distributed-cluster-state 
cluster-state-spec :auth-conf cluster-state-spec :acls acls 
:separate-zk-writer? separate-zk-writer?)])
 assignment-info-callback (atom {})
 assignment-info-with-version-callback (atom {})
 assignment-version-callback (atom {})

http://git-wip-us.apache.org/repos/asf/storm/blob/9ad27749/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
--
diff --git a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj 
b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
index 0c2b6a8..ce13110 100644
--- a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
@@ -105,7 +105,7 @@
  :storm-cluster-state (cluster/mk-storm-cluster-state conf :acls (when

(Utils/isZkAuthenticationConfiguredStormServer
  conf)
-   
NIMBUS-ZK-ACLS))
+   
NIMBUS-ZK-ACLS) :separate-zk-writer? true)
  :submit-lock (Object.)
  :cred-update-lock (Object.)
  :log-update-lock (Object.)

[3/4] storm git commit: Merge branch 'STORM-1125' of https://github.com/kishorvpatil/incubator-storm into STORM-1125

2015-10-23 Thread kabhwan 
Merge branch 'STORM-1125' of https://github.com/kishorvpatil/incubator-storm 
into STORM-1125


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

Branch: refs/heads/master
Commit: 9e859238b3b647d834319e43a46684659178a05e
Parents: 8c3fc55 9ad2774
Author: Jungtaek Lim 
Authored: Sat Oct 24 10:10:50 2015 +0900
Committer: Jungtaek Lim 
Committed: Sat Oct 24 10:10:50 2015 +0900

--
 storm-core/src/clj/backtype/storm/cluster.clj   | 69 
 .../src/clj/backtype/storm/daemon/nimbus.clj|  2 +-
 2 files changed, 43 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/9e859238/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
--

[1/4] storm git commit: Adding separate ZK client for read in Nimbus ZK State

2015-10-23 Thread kabhwan 
Repository: storm
Updated Branches:
  refs/heads/master 8c3fc5590 -> b3bc585a5


Adding separate ZK client for read in Nimbus ZK State


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

Branch: refs/heads/master
Commit: 0d8a2fa5caa7a78418001fcf67e442cd136c50f0
Parents: f75fdde
Author: Kishor Patil 
Authored: Thu Oct 22 13:51:53 2015 -0500
Committer: Kishor Patil 
Committed: Thu Oct 22 14:34:38 2015 -0500

--
 storm-core/src/clj/backtype/storm/cluster.clj | 65 ++
 1 file changed, 42 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/0d8a2fa5/storm-core/src/clj/backtype/storm/cluster.clj
--
diff --git a/storm-core/src/clj/backtype/storm/cluster.clj 
b/storm-core/src/clj/backtype/storm/cluster.clj
index e471e53..9057267 100644
--- a/storm-core/src/clj/backtype/storm/cluster.clj
+++ b/storm-core/src/clj/backtype/storm/cluster.clj
@@ -54,6 +54,10 @@
 (when (Utils/isZkAuthenticationConfiguredTopology topo-conf)
   [(first ZooDefs$Ids/CREATOR_ALL_ACL)
(ACL. ZooDefs$Perms/READ (Id. "digest" 
(DigestAuthenticationProvider/generateDigest payload)))])))
+ 
+(defn is-nimbus?
+  []
+  (= (System/getProperty "daemon.name") "nimbus"))
 
 (defnk mk-distributed-cluster-state
   [conf :auth-conf nil :acls nil]
@@ -62,7 +66,7 @@
 (.close zk))
   (let [callbacks (atom {})
 active (atom true)
-zk (zk/mk-client conf
+zk-writer (zk/mk-client conf
  (conf STORM-ZOOKEEPER-SERVERS)
  (conf STORM-ZOOKEEPER-PORT)
  :auth-conf auth-conf
@@ -70,10 +74,24 @@
  :watcher (fn [state type path]
 (when @active
   (when-not (= :connected state)
-(log-warn "Received event " state ":" 
type ":" path " with disconnected Zookeeper."))
+(log-warn "Received event " state ":" 
type ":" path " with disconnected Writer Zookeeper."))
   (when-not (= :none type)
 (doseq [callback (vals @callbacks)]
-  (callback type path))]
+  (callback type path))
+zk-reader (if (is-nimbus?)
+(zk/mk-client conf
+ (conf STORM-ZOOKEEPER-SERVERS)
+ (conf STORM-ZOOKEEPER-PORT)
+ :auth-conf auth-conf
+ :root (conf STORM-ZOOKEEPER-ROOT)
+ :watcher (fn [state type path]
+(when @active
+  (when-not (= :connected state)
+(log-warn "Received event " state ":" 
type ":" path " with disconnected Reader Zookeeper."))
+  (when-not (= :none type)
+(doseq [callback (vals @callbacks)]
+  (callback type path))
+zk-writer)]
 (reify
  ClusterState
 
@@ -89,68 +107,69 @@
 
  (set-ephemeral-node
[this path data acls]
-   (zk/mkdirs zk (parent-path path) acls)
-   (if (zk/exists zk path false)
+   (zk/mkdirs zk-writer (parent-path path) acls)
+   (if (zk/exists zk-writer path false)
  (try-cause
-   (zk/set-data zk path data) ; should verify that it's ephemeral
+   (zk/set-data zk-writer path data) ; should verify that it's 
ephemeral
(catch KeeperException$NoNodeException e
  (log-warn-error e "Ephemeral node disappeared between checking 
for existing and setting data")
- (zk/create-node zk path data :ephemeral acls)))
- (zk/create-node zk path data :ephemeral acls)))
+ (zk/create-node zk-writer path data :ephemeral acls)))
+ (zk/create-node zk-writer path data :ephemeral acls)))
 
  (create-sequential
[this path data acls]
-   (zk/create-node zk path data :sequential acls))
+   (zk/create-node zk-writer path data :sequential acls))
 
  (set-data
[this path data acls]
;; note: this does not turn off any existing watches
-   (if (zk/exists zk path false)
- (zk/set-data zk path data)
+   (if (zk/exists zk-writer path false)
+ (zk/set-data zk-writer path data)

[3/5] storm git commit: addressing comments

2015-10-23 Thread kabhwan 
addressing comments


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

Branch: refs/heads/master
Commit: 2b3e8617b88779c20524d87fe4d546ba59cc888f
Parents: b57c830
Author: Boyang Jerry Peng 
Authored: Fri Oct 23 17:09:24 2015 -0500
Committer: Boyang Jerry Peng 
Committed: Fri Oct 23 17:10:09 2015 -0500

--
 .../src/jvm/backtype/storm/validation/ConfigValidation.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/2b3e8617/storm-core/src/jvm/backtype/storm/validation/ConfigValidation.java
--
diff --git a/storm-core/src/jvm/backtype/storm/validation/ConfigValidation.java 
b/storm-core/src/jvm/backtype/storm/validation/ConfigValidation.java
index 406362f..1b0cd7f 100644
--- a/storm-core/src/jvm/backtype/storm/validation/ConfigValidation.java
+++ b/storm-core/src/jvm/backtype/storm/validation/ConfigValidation.java
@@ -401,7 +401,7 @@ public class ConfigValidation {
 }
 }
 for (Class vv : valueValidators) {
-Object valueValidator = vv.getConstructor().newInstance();;
+Object valueValidator = vv.getConstructor().newInstance();
 if (valueValidator instanceof Validator) {
 ((Validator) valueValidator).validateField(name + " 
Map value", entry.getValue());
 } else {
@@ -463,7 +463,7 @@ public class ConfigValidation {
 throw new IllegalAccessException("Field " + name + " must have 
map entry with key: class");
 }
 if(!((Map) o).containsKey("parallelism.hint") ) {
-throw new IllegalAccessException("Field " + name + " must have 
map entry with key: class");
+throw new IllegalAccessException("Field " + name + " must have 
map entry with key: parallelism.hint");
 }
 
 SimpleTypeValidator.validateField(name, String.class, ((Map) 
o).get("class"));

[2/5] storm git commit: delete unneccessary annotations

2015-10-23 Thread kabhwan 
delete unneccessary annotations


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

Branch: refs/heads/master
Commit: b57c8305460f4de46d92129c961ed46a53a216db
Parents: 80df44b
Author: Boyang Jerry Peng 
Authored: Mon Oct 19 12:44:41 2015 -0500
Committer: Boyang Jerry Peng 
Committed: Thu Oct 22 11:27:56 2015 -0500

--
 storm-core/src/jvm/backtype/storm/Config.java | 7 +++
 .../storm/validation/ConfigValidationAnnotations.java | 6 --
 2 files changed, 3 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/b57c8305/storm-core/src/jvm/backtype/storm/Config.java
--
diff --git a/storm-core/src/jvm/backtype/storm/Config.java 
b/storm-core/src/jvm/backtype/storm/Config.java
index ea58538..5f5fdec 100644
--- a/storm-core/src/jvm/backtype/storm/Config.java
+++ b/storm-core/src/jvm/backtype/storm/Config.java
@@ -253,7 +253,6 @@ public class Config extends HashMap {
  *
  * Defaults to false.
  */
-@Deprecated
 @isBoolean
 public static final String STORM_LOCAL_MODE_ZMQ = "storm.local.mode.zmq";
 
@@ -1254,8 +1253,8 @@ public class Config extends HashMap {
  * to be equal to the number of workers configured for this topology. If 
this variable is set to 0,
  * event logging will be disabled.
  */
-@isPositiveNumber
 @isInteger
+@isPositiveNumber
 public static final String TOPOLOGY_EVENTLOGGER_EXECUTORS = 
"topology.eventlogger.executors";
 
 /**
@@ -1579,8 +1578,8 @@ public class Config extends HashMap {
  * The port to use to connect to the transactional zookeeper servers. If 
null (which is default),
  * will use storm.zookeeper.port
  */
-@isPositiveNumber
 @isInteger
+@isPositiveNumber
 public static final String 
TRANSACTIONAL_ZOOKEEPER_PORT="transactional.zookeeper.port";
 
 /**
@@ -1648,8 +1647,8 @@ public class Config extends HashMap {
  * The number of machines that should be used by this topology to isolate 
it from all others. Set storm.scheduler
  * to backtype.storm.scheduler.multitenant.MultitenantScheduler
  */
-@isPositiveNumber
 @isInteger
+@isPositiveNumber
 public static final String TOPOLOGY_ISOLATED_MACHINES = 
"topology.isolate.machines";
 
 /**

http://git-wip-us.apache.org/repos/asf/storm/blob/b57c8305/storm-core/src/jvm/backtype/storm/validation/ConfigValidationAnnotations.java
--
diff --git 
a/storm-core/src/jvm/backtype/storm/validation/ConfigValidationAnnotations.java 
b/storm-core/src/jvm/backtype/storm/validation/ConfigValidationAnnotations.java
index 44d9c51..ed93370 100644
--- 
a/storm-core/src/jvm/backtype/storm/validation/ConfigValidationAnnotations.java
+++ 
b/storm-core/src/jvm/backtype/storm/validation/ConfigValidationAnnotations.java
@@ -185,12 +185,6 @@ public class ConfigValidationAnnotations {
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)
-public @interface isImpersonationAcl {
-Class validatorClass() default 
ConfigValidation.ImpersonationAclValidator.class;
-}
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.FIELD)
 public @interface isStringOrStringList {
 Class validatorClass() default 
ConfigValidation.StringOrStringListValidator.class;
 }

[4/5] storm git commit: Merge branch 'STORM-1111' of https://github.com/jerrypeng/storm into STORM-1111

2015-10-23 Thread kabhwan 
Merge branch 'STORM-' of https://github.com/jerrypeng/storm into STORM-


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

Branch: refs/heads/master
Commit: aca8bfb7dd76997340dc3d6a54479686a3ee31b0
Parents: b3bc585 2b3e861
Author: Jungtaek Lim 
Authored: Sat Oct 24 10:29:23 2015 +0900
Committer: Jungtaek Lim 
Committed: Sat Oct 24 10:29:23 2015 +0900

--
 storm-core/src/jvm/backtype/storm/Config.java   | 93 +++-
 .../storm/validation/ConfigValidation.java  | 74 +---
 .../validation/ConfigValidationAnnotations.java |  8 +-
 .../jvm/backtype/storm/TestConfigValidate.java  | 78 
 4 files changed, 212 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/aca8bfb7/storm-core/src/jvm/backtype/storm/Config.java
--

[1/5] storm git commit: [STORM-1111] - Fix Validation for lots of different configs

2015-10-23 Thread kabhwan 
Repository: storm
Updated Branches:
  refs/heads/master b3bc585a5 -> ff3b8affa


[STORM-] - Fix Validation for lots of different configs


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

Branch: refs/heads/master
Commit: 80df44ba5fcfa63dc52bb919c8b0366350e35e58
Parents: 26f966c
Author: Boyang Jerry Peng 
Authored: Mon Oct 19 11:31:59 2015 -0500
Committer: Boyang Jerry Peng 
Committed: Mon Oct 19 11:32:48 2015 -0500

--
 storm-core/src/jvm/backtype/storm/Config.java   | 94 +++-
 .../storm/validation/ConfigValidation.java  | 74 ---
 .../validation/ConfigValidationAnnotations.java |  2 +
 .../jvm/backtype/storm/TestConfigValidate.java  | 78 
 4 files changed, 213 insertions(+), 35 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/80df44ba/storm-core/src/jvm/backtype/storm/Config.java
--
diff --git a/storm-core/src/jvm/backtype/storm/Config.java 
b/storm-core/src/jvm/backtype/storm/Config.java
index a521b10..ea58538 100644
--- a/storm-core/src/jvm/backtype/storm/Config.java
+++ b/storm-core/src/jvm/backtype/storm/Config.java
@@ -66,12 +66,14 @@ public class Config extends HashMap {
  * Netty based messaging: The buffer size for send/recv buffer
  */
 @isInteger
+@isPositiveNumber
 public static final String STORM_MESSAGING_NETTY_BUFFER_SIZE = 
"storm.messaging.netty.buffer_size";
 
 /**
  * Netty based messaging: Sets the backlog value to specify when the 
channel binds to a local address
  */
 @isInteger
+@isPositiveNumber
 public static final String STORM_MESSAGING_NETTY_SOCKET_BACKLOG = 
"storm.messaging.netty.socket.backlog";
 
 /**
@@ -86,18 +88,21 @@ public class Config extends HashMap {
  * Netty based messaging: The min # of milliseconds that a peer will wait.
  */
 @isInteger
+@isPositiveNumber(includeZero = true)
 public static final String STORM_MESSAGING_NETTY_MIN_SLEEP_MS = 
"storm.messaging.netty.min_wait_ms";
 
 /**
  * Netty based messaging: The max # of milliseconds that a peer will wait.
  */
 @isInteger
+@isPositiveNumber(includeZero = true)
 public static final String STORM_MESSAGING_NETTY_MAX_SLEEP_MS = 
"storm.messaging.netty.max_wait_ms";
 
 /**
  * Netty based messaging: The # of worker threads for the server.
  */
 @isInteger
+@isPositiveNumber(includeZero = true)
 public static final String STORM_MESSAGING_NETTY_SERVER_WORKER_THREADS = 
"storm.messaging.netty.server_worker_threads";
 
 /**
@@ -141,6 +146,7 @@ public class Config extends HashMap {
  * The port Storm will use to connect to each of the ZooKeeper servers.
  */
 @isInteger
+@isPositiveNumber
 public static final String STORM_ZOOKEEPER_PORT = "storm.zookeeper.port";
 
 /**
@@ -208,7 +214,7 @@ public class Config extends HashMap {
 /**
  * Max no.of seconds group mapping service will cache user groups
  */
-@isNumber
+@isInteger
 public static final String STORM_GROUP_MAPPING_SERVICE_CACHE_DURATION_SECS 
= "storm.group.mapping.service.cache.duration.secs";
 
 /**
@@ -247,6 +253,7 @@ public class Config extends HashMap {
  *
  * Defaults to false.
  */
+@Deprecated
 @isBoolean
 public static final String STORM_LOCAL_MODE_ZMQ = "storm.local.mode.zmq";
 
@@ -365,12 +372,14 @@ public class Config extends HashMap {
  * connect to this port to upload jars and submit topologies.
  */
 @isInteger
+@isPositiveNumber
 public static final String NIMBUS_THRIFT_PORT = "nimbus.thrift.port";
 
 /**
  * The number of threads that should be used by the nimbus thrift server.
  */
-@isNumber
+@isInteger
+@isPositiveNumber
 public static final String NIMBUS_THRIFT_THREADS = "nimbus.thrift.threads";
 
 /**
@@ -406,6 +415,7 @@ public class Config extends HashMap {
  * The maximum buffer size thrift should use when reading messages.
  */
 @isInteger
+@isPositiveNumber
 public static final String NIMBUS_THRIFT_MAX_BUFFER_SIZE = 
"nimbus.thrift.max_buffer_size";
 
 /**
@@ -421,6 +431,7 @@ public class Config extends HashMap {
  * task dead and reassign it to another location.
  */
 @isInteger
+@isPositiveNumber
 public static final String NIMBUS_TASK_TIMEOUT_SECS = 
"nimbus.task.timeout.secs";
 
 
@@ -431,6

[5/5] storm git commit: add STORM-1111 to CHANGELOG.md

2015-10-23 Thread kabhwan 
add STORM- to CHANGELOG.md


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

Branch: refs/heads/master
Commit: ff3b8affaeed5b94fa5b3e57dee54ca48569d738
Parents: aca8bfb
Author: Jungtaek Lim 
Authored: Sat Oct 24 10:30:35 2015 +0900
Committer: Jungtaek Lim 
Committed: Sat Oct 24 10:30:35 2015 +0900

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


http://git-wip-us.apache.org/repos/asf/storm/blob/ff3b8aff/CHANGELOG.md
--
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5d308d7..8adfa0e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 0.11.0
+ * STORM-: Fix Validation for lots of different configs
  * STORM-1125: Adding separate ZK client for read in Nimbus ZK State
  * STORM-1121: Remove method call to avoid overhead during topology submission 
time
  * STORM-1120: Fix keyword (schema -> scheme) from main-routes

svn commit: r10891 - /dev/storm/

2015-10-23 Thread ptgoetz 
Author: ptgoetz
Date: Fri Oct 23 15:28:05 2015
New Revision: 10891

Log:
create dev directory for storm

Added:
dev/storm/

[2/3] storm git commit: Merge branch 'STORM-1120' of https://github.com/HeartSaVioR/storm

2015-10-23 Thread knusbaum 
Merge branch 'STORM-1120' of https://github.com/HeartSaVioR/storm


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

Branch: refs/heads/master
Commit: aa7dfbfa51c9cfcdc715cd2cd9764522b95f7ffe
Parents: d72e277 90eadfb
Author: Kyle Nusbaum 
Authored: Fri Oct 23 01:50:58 2015 -0500
Committer: Kyle Nusbaum 
Committed: Fri Oct 23 01:50:58 2015 -0500

--
 storm-core/src/clj/backtype/storm/ui/core.clj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--