Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bee5a54c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bee5a54c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bee5a54c
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: bee5a54ca0a32cf50e6b84a367b0d227fed3e2b5
Parents: 4945783 5fe2ccc
Author: Josh Elser <els...@apache.org>
Authored: Thu Jan 30 17:00:25 2014 -0500
Committer: Josh Elser <els...@apache.org>
Committed: Thu Jan 30 17:00:25 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
