Author: vines
Date: Wed May 16 19:45:30 2012
New Revision: 1339325
URL: http://svn.apache.org/viewvc?rev=1339325&view=rev
Log:
Merging ACCUMULO-337
Added:
accumulo/trunk/conf/examples/1GB/native-standalone/generic_logger.xml
- copied unchanged from r1339323,
accumulo/branches/1.4/conf/examples/1GB/native-standalone/generic_logger.xml
accumulo/trunk/conf/examples/1GB/native-standalone/log4j.properties
- copied unchanged from r1339323,
accumulo/branches/1.4/conf/examples/1GB/native-standalone/log4j.properties
accumulo/trunk/conf/examples/1GB/native-standalone/monitor_logger.xml
- copied unchanged from r1339323,
accumulo/branches/1.4/conf/examples/1GB/native-standalone/monitor_logger.xml
accumulo/trunk/conf/examples/1GB/standalone/generic_logger.xml
- copied unchanged from r1339323,
accumulo/branches/1.4/conf/examples/1GB/standalone/generic_logger.xml
accumulo/trunk/conf/examples/1GB/standalone/log4j.properties
- copied unchanged from r1339323,
accumulo/branches/1.4/conf/examples/1GB/standalone/log4j.properties
accumulo/trunk/conf/examples/1GB/standalone/monitor_logger.xml
- copied unchanged from r1339323,
accumulo/branches/1.4/conf/examples/1GB/standalone/monitor_logger.xml
accumulo/trunk/conf/examples/2GB/native-standalone/generic_logger.xml
- copied unchanged from r1339323,
accumulo/branches/1.4/conf/examples/2GB/native-standalone/generic_logger.xml
accumulo/trunk/conf/examples/2GB/native-standalone/log4j.properties
- copied unchanged from r1339323,
accumulo/branches/1.4/conf/examples/2GB/native-standalone/log4j.properties
accumulo/trunk/conf/examples/2GB/native-standalone/monitor_logger.xml
- copied unchanged from r1339323,
accumulo/branches/1.4/conf/examples/2GB/native-standalone/monitor_logger.xml
accumulo/trunk/conf/examples/2GB/standalone/generic_logger.xml
- copied unchanged from r1339323,
accumulo/branches/1.4/conf/examples/2GB/standalone/generic_logger.xml
accumulo/trunk/conf/examples/2GB/standalone/log4j.properties
- copied unchanged from r1339323,
accumulo/branches/1.4/conf/examples/2GB/standalone/log4j.properties
accumulo/trunk/conf/examples/2GB/standalone/monitor_logger.xml
- copied unchanged from r1339323,
accumulo/branches/1.4/conf/examples/2GB/standalone/monitor_logger.xml
accumulo/trunk/conf/examples/3GB/native-standalone/generic_logger.xml
- copied unchanged from r1339323,
accumulo/branches/1.4/conf/examples/3GB/native-standalone/generic_logger.xml
accumulo/trunk/conf/examples/3GB/native-standalone/log4j.properties
- copied unchanged from r1339323,
accumulo/branches/1.4/conf/examples/3GB/native-standalone/log4j.properties
accumulo/trunk/conf/examples/3GB/native-standalone/monitor_logger.xml
- copied unchanged from r1339323,
accumulo/branches/1.4/conf/examples/3GB/native-standalone/monitor_logger.xml
accumulo/trunk/conf/examples/3GB/standalone/generic_logger.xml
- copied unchanged from r1339323,
accumulo/branches/1.4/conf/examples/3GB/standalone/generic_logger.xml
accumulo/trunk/conf/examples/3GB/standalone/log4j.properties
- copied unchanged from r1339323,
accumulo/branches/1.4/conf/examples/3GB/standalone/log4j.properties
accumulo/trunk/conf/examples/3GB/standalone/monitor_logger.xml
- copied unchanged from r1339323,
accumulo/branches/1.4/conf/examples/3GB/standalone/monitor_logger.xml
accumulo/trunk/conf/examples/512MB/native-standalone/generic_logger.xml
- copied unchanged from r1339323,
accumulo/branches/1.4/conf/examples/512MB/native-standalone/generic_logger.xml
accumulo/trunk/conf/examples/512MB/native-standalone/log4j.properties
- copied unchanged from r1339323,
accumulo/branches/1.4/conf/examples/512MB/native-standalone/log4j.properties
accumulo/trunk/conf/examples/512MB/native-standalone/monitor_logger.xml
- copied unchanged from r1339323,
accumulo/branches/1.4/conf/examples/512MB/native-standalone/monitor_logger.xml
accumulo/trunk/conf/examples/512MB/standalone/generic_logger.xml
- copied unchanged from r1339323,
accumulo/branches/1.4/conf/examples/512MB/standalone/generic_logger.xml
accumulo/trunk/conf/examples/512MB/standalone/log4j.properties
- copied unchanged from r1339323,
accumulo/branches/1.4/conf/examples/512MB/standalone/log4j.properties
accumulo/trunk/conf/examples/512MB/standalone/monitor_logger.xml
- copied unchanged from r1339323,
accumulo/branches/1.4/conf/examples/512MB/standalone/monitor_logger.xml
Removed:
accumulo/trunk/conf/generic_logger.xml
accumulo/trunk/conf/log4j.properties
accumulo/trunk/conf/monitor_logger.xml
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:r1339309-1339323
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/core:r1339309-1339323
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/server:r1339309-1339323
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src:r1339309-1339323
