Merge branch 'STORM-741' of https://github.com/Parth-Brahmbhatt/incubator-storm into STORM-741
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/003f08d2 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/003f08d2 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/003f08d2 Branch: refs/heads/nimbus-ha-branch Commit: 003f08d2d0d224c68d620ded35ae2bebc8cfa810 Parents: bc530b4 bb968c8 Author: Sriharsha Chintalapani <[email protected]> Authored: Tue Mar 31 20:23:37 2015 -0700 Committer: Sriharsha Chintalapani <[email protected]> Committed: Tue Mar 31 20:23:37 2015 -0700 ---------------------------------------------------------------------- storm-core/src/jvm/backtype/storm/Config.java | 6 ++++++ storm-core/src/jvm/backtype/storm/utils/NimbusClient.java | 7 +++++++ 2 files changed, 13 insertions(+) ----------------------------------------------------------------------
