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/0f0acb68 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0f0acb68 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0f0acb68 Branch: refs/heads/master Commit: 0f0acb68bde24075e14fd3cd4f5261df293589ce Parents: 63f1e76 126b648 Author: Josh Elser <els...@apache.org> Authored: Tue Apr 15 00:35:38 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Tue Apr 15 00:35:38 2014 -0400 ---------------------------------------------------------------------- start/pom.xml | 7 +++++++ .../test/java/org/apache/accumulo/test/AccumuloDFSBase.java | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0f0acb68/start/pom.xml ----------------------------------------------------------------------
