[15/15] git commit: Merge branch '1.6.0-SNAPSHOT'

2014-04-23 Thread ctubbsii
Merge branch '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/7548cb71 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7548cb71 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7548cb

[15/15] git commit: Merge branch '1.6.0-SNAPSHOT'

2014-04-22 Thread busbey
Merge branch '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/4879a74c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4879a74c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4879a7

[15/15] git commit: Merge branch '1.6.0-SNAPSHOT'

2014-04-04 Thread busbey
Merge branch '1.6.0-SNAPSHOT' Conflicts: server/base/src/main/java/org/apache/accumulo/server/Accumulo.java server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java server/master/src/main/java/org/apache/accumulo/master/Master.java Project: http://g

[15/15] git commit: Merge branch '1.6.0-SNAPSHOT'

2014-01-23 Thread elserj
Merge branch '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/88a9b53d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/88a9b53d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/88a9b5

[15/15] git commit: Merge branch '1.6.0-SNAPSHOT'

2013-11-29 Thread ecn
Merge branch '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/f3a86774 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f3a86774 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f3a867