Merge branch 'STORM-1569' of https://github.com/Parth-Brahmbhatt/incubator-storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/bd396b3a Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/bd396b3a Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/bd396b3a Branch: refs/heads/master Commit: bd396b3a4ec0c242f18725ddf43e35f26da51269 Parents: 0e91995 24a87af Author: Kyle Nusbaum <kylejnusb...@gmail.com> Authored: Wed Feb 24 13:15:32 2016 -0600 Committer: Kyle Nusbaum <kylejnusb...@gmail.com> Committed: Wed Feb 24 13:15:32 2016 -0600 ---------------------------------------------------------------------- conf/defaults.yaml | 2 +- storm-core/src/jvm/org/apache/storm/Config.java | 9 +++++++++ .../apache/storm/security/auth/ThriftConnectionType.java | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/bd396b3a/conf/defaults.yaml ----------------------------------------------------------------------
