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

2014-08-04 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/1a09e25d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1a09e25d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1a09e2

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

2014-07-14 Thread bhavanki
Merge branch '1.6.1-SNAPSHOT' Conflicts: server/base/src/main/java/org/apache/accumulo/server/conf/NamespaceConfiguration.java server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

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

2014-06-19 Thread ctubbsii
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/4b99e946 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4b99e946 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4b99e9

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

2014-06-02 Thread bhavanki
Merge branch '1.6.1-SNAPSHOT' Conflicts: core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8990e590 Tree: http://git-wip-us.apache.org/rep