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/151fcb6d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/151fcb6d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/151fcb6d Branch: refs/heads/master Commit: 151fcb6dcad54a9542711e1c73d1319a2b74186f Parents: 1429eca d7f5b9e Author: Eric C. Newton <eric.new...@gmail.com> Authored: Fri Mar 21 14:51:53 2014 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Fri Mar 21 14:51:53 2014 -0400 ---------------------------------------------------------------------- .../java/org/apache/accumulo/proxy/SimpleProxyIT.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
