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

2014-01-06 Thread kturner
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

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

2013-12-26 Thread elserj
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/06cbd91e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/06cbd91e Diff:

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

2013-12-13 Thread ctubbsii
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/7fc8d834 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7fc8d834 Diff:

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

2013-11-06 Thread elserj
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: test/system/auto/README Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7a83c145 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7a83c145