[4/4] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

2014-01-06 Thread kturner
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/client/impl/ThriftTransportPool.java fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commi

[4/4] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

2013-11-15 Thread elserj
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchWriter.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/12616

[4/4] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

2013-09-20 Thread ecn
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/032099e8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/032099e8 Diff: http://git-wip-us.apache.org/repos/asf/