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/b8bd259d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b8bd259d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b8bd259d Branch: refs/heads/master Commit: b8bd259d0d8ec4c68f9bb67d1148e2afc33b73b4 Parents: e2e7d2e ee3ccb8 Author: Mike Drob <md...@cloudera.com> Authored: Mon Jan 6 16:21:31 2014 -0800 Committer: Mike Drob <md...@cloudera.com> Committed: Mon Jan 6 16:21:31 2014 -0800 ---------------------------------------------------------------------- README | 8 ++-- pom.xml | 47 +++++++++++++++----- .../main/resources/docs/examples/README.dirlist | 2 +- test/pom.xml | 38 ++++++++++++---- 4 files changed, 72 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/b8bd259d/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/b8bd259d/test/pom.xml ----------------------------------------------------------------------