Merge branch '1.5.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8103017c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8103017c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8103017c Branch: refs/heads/master Commit: 8103017cfd299c94ba664f0c565193080ff88d31 Parents: 864f5a0 a25e3af Author: Eric Newton <[email protected]> Authored: Mon Sep 23 11:57:51 2013 -0400 Committer: Eric Newton <[email protected]> Committed: Mon Sep 23 11:57:51 2013 -0400 ---------------------------------------------------------------------- .../core/security/ColumnVisibility.java | 13 ++++++------ .../core/security/ColumnVisibilityTest.java | 21 ++++++++++++++++++++ 2 files changed, 28 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
