[1/3] git commit: ACCUMULO-1628 made InMemoryMap iterator deepCopy work after delete

Repository: accumulo Updated Branches: refs/heads/master 21d3c88d8 -> 5c48ec8a3 ACCUMULO-1628 made InMemoryMap iterator deepCopy work after delete Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/30a0ca3e Tree: http:/

[3/3] git commit: Merge branch '1.6.1-SNAPSHOT'

Merge branch '1.6.1-SNAPSHOT' Conflicts: server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5c48ec8a Tree: http://git-wip-us.apache.org/rep

[2/3] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Conflicts: server/tserver/src/test/java/org/apache/accumulo/tserver/InMemoryMapTest.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3d3d301f Tree: http://g

[1/2] git commit: ACCUMULO-1628 made InMemoryMap iterator deepCopy work after delete

Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT 23c74cd44 -> 3d3d301f4 ACCUMULO-1628 made InMemoryMap iterator deepCopy work after delete Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/30a0ca3e Tree

[2/2] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Conflicts: server/tserver/src/test/java/org/apache/accumulo/tserver/InMemoryMapTest.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3d3d301f Tree: http://g

git commit: ACCUMULO-1628 made InMemoryMap iterator deepCopy work after delete

Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT 345332b01 -> 30a0ca3e8 ACCUMULO-1628 made InMemoryMap iterator deepCopy work after delete Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/30a0ca3e Tree