Author: vines
Date: Tue May 15 21:12:26 2012
New Revision: 1338897
URL: http://svn.apache.org/viewvc?rev=1338897&view=rev
Log:
ACCUMULO-364 Also fixed in trunk
Added:
accumulo/trunk/conf/accumulo.policy.example
- copied unchanged from r1338881,
accumulo/branches/1.4/conf/accumulo.policy.example
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:r1336821-1338881
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/core:r1336821-1338881
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/server:r1336821-1338881
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src:r1336821-1338881
Merged /accumulo/trunk:r1337210
