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/afbf5f16 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/afbf5f16 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/afbf5f16 Branch: refs/heads/master Commit: afbf5f1600faf4e665c0e90f5baa4549b9f79832 Parents: 72f2c95 d9fe315 Author: Eric C. Newton <eric.new...@gmail.com> Authored: Fri Mar 21 15:30:53 2014 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Fri Mar 21 15:30:53 2014 -0400 ---------------------------------------------------------------------- proxy/src/test/java/org/apache/accumulo/proxy/SimpleProxyIT.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
