Repository: storm Updated Branches: refs/heads/master c8947c2fe -> 914abe59b
[STORM-2777] The number of ackers should default to the number of workers Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/767c7f3b Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/767c7f3b Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/767c7f3b Branch: refs/heads/master Commit: 767c7f3be8699099ad9b2ffbdfc8baab36dd14f0 Parents: ca02289 Author: Ethan Li <[email protected]> Authored: Mon Oct 16 10:11:42 2017 -0500 Committer: Ethan Li <[email protected]> Committed: Mon Oct 16 10:11:42 2017 -0500 ---------------------------------------------------------------------- .../src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/767c7f3b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java ---------------------------------------------------------------------- diff --git a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java index 180abfd..3b914ba 100644 --- a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java +++ b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java @@ -2673,7 +2673,7 @@ public class Nimbus implements Iface, Shutdownable, DaemonCommon { } Map<String, Object> otherConf = Utils.getConfigFromClasspath(cp, conf); Map<String, Object> totalConfToSave = Utils.merge(otherConf, topoConf); - Map<String, Object> totalConf = Utils.merge(totalConfToSave, conf); + Map<String, Object> totalConf = Utils.merge(conf, totalConfToSave); //When reading the conf in nimbus we want to fall back to our own settings // if the other config does not have it set. topology = normalizeTopology(totalConf, topology);
