You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by kn...@apache.org on 2015/10/19 22:07:13 UTC

[16/18] storm git commit: Upmerge

Upmerge


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

Branch: refs/heads/master
Commit: b0e52ac89094fe08d725adf6a3d82374fd61c49e
Parents: 9bf8b27
Author: zhuol <zh...@yahoo-inc.com>
Authored: Mon Oct 19 09:43:32 2015 -0500
Committer: zhuol <zh...@yahoo-inc.com>
Committed: Mon Oct 19 09:44:13 2015 -0500

----------------------------------------------------------------------
 storm-core/src/jvm/backtype/storm/Config.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/b0e52ac8/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 a1c732d..c2ed719 100644
--- a/storm-core/src/jvm/backtype/storm/Config.java
+++ b/storm-core/src/jvm/backtype/storm/Config.java
@@ -1047,8 +1047,9 @@ public class Config extends HashMap<String, Object> {
     /**
      * The default heap memory size in MB per worker, used in the jvm -Xmx opts for launching the worker
       */
+    @isInteger
+    @isPositiveNumber
     public static final String WORKER_HEAP_MEMORY_MB = "worker.heap.memory.mb";
-    public static final Object WORKER_HEAP_MEMORY_MB_SCHEMA = ConfigValidation.PositiveIntegerValidator;
 
     /**
      * The jvm opts provided to workers launched by this supervisor for GC. All "%ID%" substrings are replaced