[maven-release-plugin] prepare for next development iteration
ACCUMULO-2765 Convert FrameworkTest to junit4

Use JUnit 4
To enable new features
Don't catch exceptions
Merge remote-tracking branch 'origin/1.6.0-SNAPSHOT' into 1.6.1-SNAPSHOT
ACCUMULO-2343 Add AsyncSocketAppender

AsyncSocketAppender is a Log4J AsyncAppender with its own internal SocketAppender.
Configuration for either appender can be set on the AsyncSocketAppender itself. An
AsyncSocketAppender can be configured using a Log4J properties file, while an ordinary
AsyncAppender cannot.
ACCUMULO-2383 Add log4j properties support

Accumulo now looks for either XML or properties files for the Log4J configuration. It will
also heed the log4j.configuration isystem property if it is set. Its MonitorLog4jWatcher
can now load either properties or XML.
ACCUMULO-2212 Add ZooReaderWriterFactory

The o.a.a.server.zookeeper.ZooReaderWriter class is mostly copied into a new
ZooReaderWriterFactory class. Users of the factory can work directly with FATE
ZooReaderWriter instances, instead of those of the server type, which is no longer
needed. The logic for building instances from site configuration data is in the
factory.

As part of this change, the invocation handler used to retry ZK calls on connection
loss is refactored into a new RetryingInvocationHandler.
ACCUMULO-2791 Downgrade commons-codec to match that provided by Hadoop.

* Povide a core.util Base64 class to enforce the non-chunked behavior we rely on
* Changed to use codec 1.4 'shaHex' method
ACCUMULO-2798 make MonitorLoggingIT retry.

Sets a timeout so it doesn't retry forever.
ACCUMULO-2804 Remove plexus-utils dependency.
ACCUMULO-2805 exclude unused transitive dep.
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
ACCUMULO-2790 generate_monitor_certificate.sh fails on OSX
ACCUMULO-2768 Agitator not restarting all datanodes
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
ACCUMULO-2770 Add utility to read local WAL

Forward port the upgrade code from 1.5.x into a separate utility so
that a user can still read local WALs if they happen to be around.

Recreate LogFile{Key,Value} in their old packages so that we can still
read the old sequence files that have embedded class names.

Modify the utility to optionally accept values as command line options
instead of searching around in the configuration settings. Testability!

Add a WAL file explicitly generated under 1.4 for testing purposes.

Add documentation to the troubleshooting guide to describe usage.

Recover your logs
After something has gone wrong
Watch your flowers bloom

commit 2db5ce6186e32c451328154b024951cc5090505f
Author: Eric C. Newton <ecn@apache.org>
Date:   Tue Jun 5 13:18:22 2012 +0000
ACCUMULO-2807 Use deprecated SequenceFile.Reader

Use the old method
Of creating a reader
To retain compat
ACCUMULO-2764 Wrap the MAC process termination in a Callable to get timeout semantics
ACCUMULO-2813 Basic log4j appender configuration for new server modules at test time.
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Conflicts:
	minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
Merge branch '1.6.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.1-SNAPSHOT