Author: elserj
Date: Thu Jun 20 00:27:11 2013
New Revision: 1494819
URL: http://svn.apache.org/r1494819
Log:
ACCUMULO-1504 Final merge from 1.5 to trunk to resolve the duplicate add I
caused in the first place with Miguel's patch
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/core/ (props changed)
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged
/accumulo/branches/1.5:r1492949-1493893,1493895-1494360,1494362-1494371,1494373-1494818
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged
/accumulo/branches/1.5/core:r1492949-1493893,1493895-1494360,1494362-1494371,1494373-1494818
Merged /accumulo/branches/1.4/src/core:r1494816
