Author: ecn
Date: Wed Jun 27 19:25:44 2012
New Revision: 1354681
URL: http://svn.apache.org/viewvc?rev=1354681&view=rev
Log:
ACCUMULO-646 ACCUMULO-659 ACCUMULO-17 merge to trunk
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/core/ (props changed)
accumulo/trunk/server/ (props changed)
accumulo/trunk/src/ (props changed)
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src:r1354670-1354672
Merged /accumulo/branches/1.4:r1354669-1354672
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/core:r1354669-1354672
Merged /accumulo/branches/1.4/src/core:r1354670-1354672
Merged /accumulo/branches/1.4:r1354671
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/server:r1354669-1354672
Merged /accumulo/branches/1.4/src/server:r1354670-1354672
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src:r1354669-1354672
Merged /accumulo/branches/1.4/src/src:r1354670-1354672
Merged /accumulo/branches/1.4:r1354671
