Merge branch '1.6.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/23e6ea8d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/23e6ea8d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/23e6ea8d Branch: refs/heads/master Commit: 23e6ea8dd672faf4ff4c719666da30ffe6762e40 Parents: 560bece be62a67 Author: Christopher Tubbs <[email protected]> Authored: Fri Jun 27 12:20:03 2014 -0400 Committer: Christopher Tubbs <[email protected]> Committed: Fri Jun 27 12:20:03 2014 -0400 ---------------------------------------------------------------------- assemble/pom.xml | 6 +---- .../main/scripts/generate-example-configs.sh | 25 ++++++++++++++++++++ 2 files changed, 26 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/23e6ea8d/assemble/pom.xml ----------------------------------------------------------------------
