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

2014-08-27 Thread elserj
Merge branch '1.6.1-SNAPSHOT' Conflicts: assemble/bin/start-server.sh assemble/bin/stop-server.sh Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/91186bf2 Tree: http://git-wip-us.apache.org/repos/asf/acc

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

2014-08-22 Thread ctubbsii
Merge branch '1.6.1-SNAPSHOT' Conflicts: core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java server/base/src/main/java/org/apache/accumulo/server/conf/ZooCachePropertyAccessor.java server/base/src/main/java/org/apache/accumulo/server/conf/ZooConfig

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

2014-08-22 Thread ctubbsii
Merge branch '1.6.1-SNAPSHOT' git merge -sours 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/d4d57334 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d4d57334 Diff: http://git-wip-us.apache

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

2014-08-21 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/eb427d7b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/eb427d7b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/eb427d

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

2014-08-12 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/b8271d49 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b8271d49 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b8271d

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

2014-07-23 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/7d284015 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7d284015 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7d2840

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

2014-06-12 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/5e447805 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5e447805 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5e4478

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

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