[05/10] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

2014-01-06 Thread vines
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java core/src/main/java/org/apache/accumulo/core/util/ThriftUtil.java core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImp

[05/10] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

2013-11-26 Thread ecn
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f4600130 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f4600130 Diff: http://git-wip-us.apache.org/repos/asf/