Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
proxy/src/test/java/org/apache/accumulo/proxy/SimpleProxyIT.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8f98331c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8f98331c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8f98331c
Branch: refs/heads/master
Commit: 8f98331c5ea3e3a3c0068b03bfdd37fb08dc4631
Parents: 7c2a552 082adbf
Author: Eric Newton <eric.new...@gmail.com>
Authored: Fri Mar 14 14:18:56 2014 -0400
Committer: Eric Newton <eric.new...@gmail.com>
Committed: Fri Mar 14 14:18:56 2014 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
