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

2014-09-12 Thread elserj
Merge branch '1.6.1-SNAPSHOT' Conflicts: server/tserver/src/main/java/org/apache/accumulo/tserver/InMemoryMap.java server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us

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

2014-06-24 Thread elserj
Merge branch '1.6.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9defedf2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9defedf2 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9defed

[10/10] git commit: Merge branch '1.6.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.1-SNAPSHOT

2014-05-16 Thread elserj
Merge branch '1.6.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d54de55f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d