Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/688fa041 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/688fa041 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/688fa041 Branch: refs/heads/master Commit: 688fa0419c83f821cfe146ecafac72274032c4df Parents: d0e6c0b f913854 Author: Josh Elser <els...@apache.org> Authored: Sun May 10 17:06:06 2015 -0400 Committer: Josh Elser <els...@apache.org> Committed: Sun May 10 17:06:06 2015 -0400 ---------------------------------------------------------------------- .../client/lexicoder/BigIntegerLexicoder.java | 10 +++ .../core/client/lexicoder/DateLexicoder.java | 10 +++ .../core/client/lexicoder/DoubleLexicoder.java | 10 +++ .../core/client/lexicoder/IntegerLexicoder.java | 10 +++ .../core/client/lexicoder/ListLexicoder.java | 10 +++ .../core/client/lexicoder/PairLexicoder.java | 10 +++ .../core/client/lexicoder/StringLexicoder.java | 10 +++ .../core/client/lexicoder/TextLexicoder.java | 10 +++ .../client/lexicoder/UIntegerLexicoder.java | 10 +++ .../core/client/lexicoder/ULongLexicoder.java | 10 +++ .../core/client/lexicoder/UUIDLexicoder.java | 10 +++ .../accumulo/core/iterators/LongCombiner.java | 30 +++++++++ .../core/iterators/user/BigDecimalCombiner.java | 10 +++ .../iterators/user/SummingArrayCombiner.java | 20 ++++++ .../tabletserver/LargestFirstMemoryManager.java | 13 ++++ .../LargestFirstMemoryManagerTest.java | 67 ++++++++++++++++++++ .../test/continuous/ContinuousBatchWalker.java | 6 +- .../replication/MultiInstanceReplicationIT.java | 20 ++++++ 18 files changed, 273 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/688fa041/test/src/test/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java ----------------------------------------------------------------------
