Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
examples/simple/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/352dc1b8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/352dc1b8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/352dc1b8
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 352dc1b8ba693fc0ed53a9610eed052daf3be1b5
Parents: 7189bb2 072ed61
Author: Christopher Tubbs <ctubb...@apache.org>
Authored: Fri Dec 6 22:47:12 2013 -0500
Committer: Christopher Tubbs <ctubb...@apache.org>
Committed: Fri Dec 6 22:47:12 2013 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
