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/012efd72 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/012efd72 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/012efd72 Branch: refs/heads/master Commit: 012efd72d3a759527377134956ba357b3bbdff6e Parents: ffd5301 4b51dd0 Author: Josh Elser <els...@apache.org> Authored: Sat Feb 8 17:28:03 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Sat Feb 8 17:28:03 2014 -0500 ---------------------------------------------------------------------- .../test/java/org/apache/accumulo/proxy/SimpleProxyIT.java | 9 +++++++++ 1 file changed, 9 insertions(+) ----------------------------------------------------------------------