You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@accumulo.apache.org by el...@apache.org on 2015/05/28 20:10:07 UTC

[05/10] accumulo git commit: Merge branch '1.5' into 1.6

Merge branch '1.5' into 1.6


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/244eeb67
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/244eeb67
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/244eeb67

Branch: refs/heads/1.7
Commit: 244eeb671b7fef7c682151a1f8c227ff1f39b673
Parents: 0cf5b9c 362b8ac
Author: Josh Elser <el...@apache.org>
Authored: Thu May 28 14:09:33 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu May 28 14:09:33 2015 -0400

----------------------------------------------------------------------
 .../test/java/org/apache/accumulo/proxy/ProxyServerTest.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------