Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Delete conflicts; functional tests moved to ITs.
Conflicts:
test/src/main/java/org/apache/accumulo/test/functional/RunTests.java
test/system/auto/README
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4223d668
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4223d668
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4223d668
Branch: refs/heads/ACCUMULO-2061
Commit: 4223d668197a911d0dcc01ca25d54790c0082bcc
Parents: a63e7c9 bc9cee0
Author: Sean Busbey <bus...@cloudera.com>
Authored: Mon Mar 10 10:28:12 2014 -0500
Committer: Sean Busbey <bus...@cloudera.com>
Committed: Mon Mar 10 10:28:12 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
