addressing @d2r comments
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e19dafbe Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e19dafbe Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e19dafbe Branch: refs/heads/master Commit: e19dafbece89d7d9e440e4a0eacd8b5e544063de Parents: 42ce11e Author: Boyang Jerry Peng <[email protected]> Authored: Sun Feb 14 17:01:37 2016 -0600 Committer: Boyang Jerry Peng <[email protected]> Committed: Sun Feb 14 17:01:37 2016 -0600 ---------------------------------------------------------------------- storm-core/src/jvm/org/apache/storm/Config.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/e19dafbe/storm-core/src/jvm/org/apache/storm/Config.java ---------------------------------------------------------------------- diff --git a/storm-core/src/jvm/org/apache/storm/Config.java b/storm-core/src/jvm/org/apache/storm/Config.java index a4d3409..931afce 100644 --- a/storm-core/src/jvm/org/apache/storm/Config.java +++ b/storm-core/src/jvm/org/apache/storm/Config.java @@ -2260,7 +2260,7 @@ public class Config extends HashMap<String, Object> { * The amount of memory a worker can exceed its allocation before cgroup will kill it */ @isPositiveNumber - public static String STORM_CGROUP_MEMORY_MB_LIMIT_TOLERANCE_MARGIN = "storm.cgroup.memory.limit.tolerance.margin.mb"; + public static String STORM_CGROUP_MEMORY_MB_LIMIT_TOLERANCE_MARGIN = "storm.cgroup.memory.mb.limit.tolerance.margin"; public static void setClasspath(Map conf, String cp) { conf.put(Config.TOPOLOGY_CLASSPATH, cp);
