Merge branch 'STORM-2679-merge'
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/4c9a864f Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/4c9a864f Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/4c9a864f Branch: refs/heads/master Commit: 4c9a864f337281a655c46e7f227b1ae043f8cc56 Parents: aaebc3b d364270 Author: Jungtaek Lim <[email protected]> Authored: Wed Aug 9 13:38:11 2017 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Wed Aug 9 13:38:11 2017 +0900 ---------------------------------------------------------------------- .../storm/cassandra/Murmur3StreamGrouping.java | 2 +- .../apache/storm/jdbc/common/JdbcClient.java | 124 ++++++++++--------- .../apache/storm/flux/parser/FluxParser.java | 11 +- .../jvm/org/apache/storm/StormSubmitter.java | 2 +- .../org/apache/storm/security/auth/AutoSSL.java | 8 +- .../src/jvm/org/apache/storm/utils/Utils.java | 2 +- .../apache/storm/blobstore/BlobStoreUtils.java | 4 +- .../org/apache/storm/utils/ServerUtils.java | 2 +- .../java/org/apache/storm/LocalStateTest.java | 2 +- .../apache/storm/blobstore/BlobStoreTest.java | 2 +- 10 files changed, 82 insertions(+), 77 deletions(-) ----------------------------------------------------------------------
