ACCUMULO-2039 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/c11e41cb Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c11e41cb Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c11e41cb Branch: refs/heads/master Commit: c11e41cbf5d732c574c1aab96d1df56458c4240d Parents: 0c8bb6c 9a34281 Author: Bill Havanki <[email protected]> Authored: Tue Jan 14 10:09:59 2014 -0500 Committer: Bill Havanki <[email protected]> Committed: Tue Jan 14 10:09:59 2014 -0500 ---------------------------------------------------------------------- .../apache/accumulo/core/security/Authorizations.java | 8 +++++++- .../org/apache/accumulo/core/util/ByteBufferUtil.java | 14 -------------- 2 files changed, 7 insertions(+), 15 deletions(-) ----------------------------------------------------------------------
