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/90a4c615 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/90a4c615 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/90a4c615 Branch: refs/heads/master Commit: 90a4c6159f7b8f1d855ad630a6744f4eacdb3ffb Parents: a12b374 0720515 Author: Keith Turner <ktur...@apache.org> Authored: Wed Jan 20 13:27:50 2016 -0500 Committer: Keith Turner <ktur...@apache.org> Committed: Wed Jan 20 13:27:50 2016 -0500 ---------------------------------------------------------------------- .../impl/AuthenticationTokenIdentifier.java | 3 +- .../accumulo/core/data/ArrayByteSequence.java | 11 +- .../accumulo/core/util/ByteBufferUtil.java | 45 ++++++-- .../accumulo/core/util/ThriftMessageUtil.java | 8 -- .../core/util/UnsynchronizedBuffer.java | 4 +- .../accumulo/core/util/ByteBufferUtilTest.java | 112 +++++++++++++++++++ .../core/util/ThriftMessageUtilTest.java | 8 -- .../org/apache/accumulo/proxy/ProxyServer.java | 2 +- .../security/delegation/AuthenticationKey.java | 3 +- 9 files changed, 161 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/90a4c615/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java ----------------------------------------------------------------------
