Merge branch 'STORM-519' of 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/8c4eebf2 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8c4eebf2 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8c4eebf2 Branch: refs/heads/master Commit: 8c4eebf27cddfe1dca4d7c3618ffba7bf97d999d Parents: 7ab4f24 f87bb31 Author: P. Taylor Goetz <[email protected]> Authored: Thu Oct 9 15:54:19 2014 -0400 Committer: P. Taylor Goetz <[email protected]> Committed: Thu Oct 9 15:54:19 2014 -0400 ---------------------------------------------------------------------- external/storm-hbase/pom.xml | 2 +- .../main/java/org/apache/storm/hbase/bolt/HBaseLookupBolt.java | 2 +- .../org/apache/storm/hbase/bolt/mapper/HBaseValueMapper.java | 4 +++- .../java/org/apache/storm/hbase/trident/state/HBaseState.java | 6 ++++-- .../org/apache/storm/hbase/topology/WordCountValueMapper.java | 3 ++- 5 files changed, 11 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
