git commit: ACCUMULO-3010 include a test to ensure recovery doesn't do a merge

2014-08-07 Thread ecn
Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT 20aecf7d6 -> 1b49f44d1 ACCUMULO-3010 include a test to ensure recovery doesn't do a merge Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1b49f44d Tree

[1/2] git commit: ACCUMULO-3010 include a test to ensure recovery doesn't do a merge

2014-08-07 Thread ecn
Repository: accumulo Updated Branches: refs/heads/master 4bb28faaf -> 6ef85f9c5 ACCUMULO-3010 include a test to ensure recovery doesn't do a merge Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1b49f44d Tree: http:/