Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7a4eb2b0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7a4eb2b0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7a4eb2b0 Branch: refs/heads/master Commit: 7a4eb2b0c4abaf883df0b74af751da6ce9d49b5e Parents: f63448c 48128c0 Author: Mike Drob <md...@mdrob.com> Authored: Mon Nov 11 14:48:55 2013 -0500 Committer: Mike Drob <md...@mdrob.com> Committed: Mon Nov 11 14:48:55 2013 -0500 ---------------------------------------------------------------------- .../accumulo/core/security/ColumnVisibility.java | 13 +++++++++++-- .../accumulo/core/security/ColumnVisibilityTest.java | 7 +++++++ 2 files changed, 18 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
