Merge branch 'master' into GORA-417
Project: http://git-wip-us.apache.org/repos/asf/gora/repo Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/f6bf4cfc Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/f6bf4cfc Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/f6bf4cfc Branch: refs/heads/master Commit: f6bf4cfc328453af90c7ae44b37cecbf48e7060a Parents: aad4ad4 578f5f8 Author: Lewis John McGibbney <[email protected]> Authored: Thu Sep 3 11:59:20 2015 -0700 Committer: Lewis John McGibbney <[email protected]> Committed: Thu Sep 3 11:59:20 2015 -0700 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../java/org/apache/gora/accumulo/encoders/HexEncoder.java | 5 +---- .../java/org/apache/gora/examples/mapreduce/QueryCounter.java | 4 ++-- .../src/main/java/org/apache/gora/query/impl/ResultBase.java | 7 ++----- .../main/java/org/apache/gora/query/ws/impl/ResultWSBase.java | 5 +---- .../main/java/org/apache/gora/hbase/store/HBaseColumn.java | 6 +----- .../java/org/apache/gora/hbase/util/HBaseByteInterface.java | 2 +- 7 files changed, 10 insertions(+), 21 deletions(-) ----------------------------------------------------------------------
