Merge branch 'STORM-1761-1.x' into 1.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2496c99a Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2496c99a Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2496c99a Branch: refs/heads/1.x-branch Commit: 2496c99ab3814642c3064aad352bc01b4e57920f Parents: f978014 928bfe5 Author: Jungtaek Lim <[email protected]> Authored: Mon May 16 18:08:11 2016 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Mon May 16 18:08:11 2016 +0900 ---------------------------------------------------------------------- .../test/java/org/apache/storm/solr/topology/SolrTopology.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
