tree 81cd0a3ba3bcc2dd32af7b9837c8576b38df7140
parent faa7f8d9427d515104f2248d465d2d2fc599c401
parent c4ca799116c6af2d3cc76f1c2e8dd75c32fdbb24
author Josh Elser <elserj@rpi.edu> 1379452696 -0400
committer Josh Elser <elserj@rpi.edu> 1379452696 -0400

ACCUMULO-1166 Merge branch '1.4' into 1.5

Rework some more of the hadoop-1 and hadoop-2 support since 1.5.0 has
the compatibility to run on both present.

Conflicts:
	README.md
	pom.xml
	src/main/resources/archetype-resources/pom.xml
	src/main/resources/archetype-resources/src/test/java/ExampleAccumuloUnitTest.java