Revision 1484874

Jump to revision:
Author:	cjnolet
Date:	Tue May 21 16:58:58 2013 UTC (10 years, 11 months ago)
Changed paths:	13
Log Message:	Merging 1.5 with trunk.

Changed paths

Path	Details
accumulo/trunk/	modified , props changed
accumulo/trunk/core/	modified , props changed
accumulo/trunk/core/pom.xml	modified , text changed
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java	modified , text changed
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Property.java	modified , text changed
accumulo/trunk/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java	modified , text changed
accumulo/trunk/examples/	modified , props changed
accumulo/trunk/examples/simple/pom.xml	modified , text changed
accumulo/trunk/proxy/pom.xml	modified , text changed
accumulo/trunk/server/	modified , props changed
accumulo/trunk/server/pom.xml	modified , text changed
accumulo/trunk/start/pom.xml	modified , text changed
accumulo/trunk/test/pom.xml	modified , text changed