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

2014-09-10 Thread elserj
Merge branch '1.6.1-SNAPSHOT' Conflicts: server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6104c98b Tree: http://git-wip-us.apache.org/re

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

2014-08-13 Thread bhavanki
Merge branch '1.6.1-SNAPSHOT' Conflicts: core/src/main/java/org/apache/accumulo/core/conf/ConfigSanityCheck.java core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java Project:

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

2014-05-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/0712ec97 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0712ec97 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0712ec

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

2014-05-16 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/dc69bc80 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dc69bc80 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dc69bc

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

2014-05-13 Thread busbey
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/51742c65 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/51742c65 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/51742c