Merge branch '1.6.0-SNAPSHOT' into ACCUMULO-2061
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0b4d5035 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0b4d5035 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0b4d5035 Branch: refs/heads/ACCUMULO-2061 Commit: 0b4d50358b3edfa0e42ecd9902c99ce2cdc8bedf Parents: 5db4997 7c2a552 Author: Josh Elser <els...@apache.org> Authored: Fri Mar 14 14:00:57 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Fri Mar 14 14:00:57 2014 -0400 ---------------------------------------------------------------------- README | 5 +- .../accumulo/core/data/ArrayByteSequence.java | 7 +- .../apache/accumulo/core/data/KeyExtent.java | 3 +- .../core/security/NamespacePermission.java | 1 + .../core/data/ArrayByteSequenceTest.java | 107 +++++++++ .../accumulo/core/data/ByteSequenceTest.java | 41 ++++ .../apache/accumulo/core/data/ColumnTest.java | 70 ++++-- .../accumulo/core/data/KeyExtentTest.java | 240 ++++++++++++++----- .../org/apache/accumulo/core/data/KeyTest.java | 33 +++ .../iterators/user/BigDecimalCombinerTest.java | 91 +++++-- .../core/iterators/user/CombinerTest.java | 2 +- .../core/security/ColumnVisibilityTest.java | 34 ++- .../core/security/NamespacePermissionsTest.java | 39 +++ .../core/security/VisibilityConstraintTest.java | 106 ++++++++ pom.xml | 7 + .../tserver/TabletServerResourceManager.java | 19 +- .../randomwalk/security/SecurityFixture.java | 2 + .../test/MasterRepairsDualAssignmentIT.java | 3 + 18 files changed, 697 insertions(+), 113 deletions(-) ----------------------------------------------------------------------
