Merge remote-tracking branch 'origin/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/3056d89f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3056d89f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3056d89f Branch: refs/heads/master Commit: 3056d89f291f3172f7b4e2c106af30574fc22d2f Parents: 1dd7d21 73fae63 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Tue Apr 15 20:35:00 2014 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Tue Apr 15 20:35:00 2014 -0400 ---------------------------------------------------------------------- CHANGES | 12 ++++++++++-- pom.xml | 10 +++++++++- start/pom.xml | 2 ++ test/pom.xml | 23 +++++++++-------------- 4 files changed, 30 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/3056d89f/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/3056d89f/start/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/3056d89f/test/pom.xml ----------------------------------------------------------------------
