Merge branch 'STORM-711' of https://github.com/Parth-Brahmbhatt/incubator-storm into STORM-711
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/fe556e9f Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/fe556e9f Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/fe556e9f Branch: refs/heads/nimbus-ha-branch Commit: fe556e9f7a857158e9bad24cea74b7a063a783de Parents: 330e135 ffb1562 Author: Sriharsha Chintalapani <[email protected]> Authored: Sun Mar 29 21:39:29 2015 -0700 Committer: Sriharsha Chintalapani <[email protected]> Committed: Sun Mar 29 21:39:29 2015 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/storm/hbase/bolt/HBaseBolt.java | 2 +- .../main/java/org/apache/storm/hbase/bolt/HBaseLookupBolt.java | 4 ++-- .../java/org/apache/storm/hbase/trident/state/HBaseState.java | 2 +- .../src/main/java/org/apache/storm/hdfs/bolt/HdfsBolt.java | 2 +- .../main/java/org/apache/storm/hdfs/bolt/SequenceFileBolt.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
