ACCUMULO-1327 removed commented style info from manual header
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
Merge branch '1.6.1-SNAPSHOT'

Conflicts:
	core/src/main/java/org/apache/accumulo/core/iterators/user/IntersectingIterator.java
	core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
	core/src/main/java/org/apache/accumulo/core/util/Encoding.java
	mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/ConfiguratorBase.java
	mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java
	server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java
	server/base/src/main/java/org/apache/accumulo/server/util/DumpZookeeper.java
	server/master/src/main/java/org/apache/accumulo/master/tableOps/Utils.java
	server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TServersServlet.java
	shell/src/main/java/org/apache/accumulo/shell/commands/AddSplitsCommand.java
	shell/src/main/java/org/apache/accumulo/shell/commands/CreateTableCommand.java
	shell/src/main/java/org/apache/accumulo/shell/commands/GetSplitsCommand.java
	shell/src/main/java/org/apache/accumulo/shell/commands/HiddenCommand.java
	test/src/main/java/org/apache/accumulo/test/randomwalk/shard/BulkInsert.java
ACCUMULO-2798 make MonitorLoggingIT retry.

Sets a timeout so it doesn't retry forever.
Merge branch '1.6.1-SNAPSHOT'
ACCUMULO-2804 Remove plexus-utils dependency.
ACCUMULO-2805 exclude unused transitive dep.
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Merge branch '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
Merge branch '1.6.1-SNAPSHOT'

Conflicts:
	docs/src/main/latex/accumulo_user_manual/chapters/troubleshooting.tex
ACCUMULO-2807 Use deprecated SequenceFile.Reader

Use the old method
Of creating a reader
To retain compat
Merge branch '1.6.1-SNAPSHOT'
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.6.1-SNAPSHOT'
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Conflicts:
	minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java