Author: ctubbsii Date: Fri Jun 14 03:59:04 2013 New Revision: 1492947 URL: http://svn.apache.org/r1492947 Log: ACCUMULO-1498 ensure 1.4 merges cleanly to 1.5
Modified:
accumulo/branches/1.5/core/ (props changed)
Propchange: accumulo/branches/1.5/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src/core:r1356901-1358205
