[1/2] git commit: ACCUMULO-1831 fix recovered log cleanup

Updated Branches: refs/heads/master cfdc869a8 -> 44338a9b8 ACCUMULO-1831 fix recovered log cleanup Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/437da6ec Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4

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

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/44338a9b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/44338a9b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/44338a

git commit: ACCUMULO-1831 fix recovered log cleanup

Updated Branches: refs/heads/1.6.0-SNAPSHOT c10ccf375 -> 437da6ec6 ACCUMULO-1831 fix recovered log cleanup Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/437da6ec Tree: http://git-wip-us.apache.org/repos/asf/accumul

[07/11] git commit: ACCUMULO-1833 Fix merge to 1.6.0 regarding TCredentials->Credentials

ACCUMULO-1833 Fix merge to 1.6.0 regarding TCredentials->Credentials Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/515cd9df Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/515cd9df Diff: http://git-wip-us.ap

[01/11] git commit: ACCUMULO-1858 Backport ZooKeeper clean up to 1.4 and 1.5.

Updated Branches: refs/heads/master edf8e28a2 -> cfdc869a8 ACCUMULO-1858 Backport ZooKeeper clean up to 1.4 and 1.5. Fix cherry picks two commits: ACCUMULO-1379 - Adding close() to Instance to assist in freeing up resources (cherry picked from commit 7da1164d87227960d3e0cfc841f753067e2c0304)

[11/11] git commit: Merge remote-tracking branch 'apache-committers/1.6.0-SNAPSHOT'

Merge remote-tracking branch 'apache-committers/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/cfdc869a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cfdc869a Diff: http://git-wip-us.apache.

[10/11] git commit: Merge remote-tracking branch 'apache-committers/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge remote-tracking branch 'apache-committers/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Did a merge for ACCUMULO-1858 and picked some "Elser" slack. Conflicts: core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java server/base/src/main/java/org/apache/accumulo/se

[05/11] git commit: Merge branch '1.5.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.1-SNAPSHOT

Merge branch '1.5.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.1-SNAPSHOT Conflicts: examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchWriter.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://

[08/11] git commit: ACCUMULO-1892 redo resolving conflict resolution from 1.4 merge

ACCUMULO-1892 redo resolving conflict resolution from 1.4 merge Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/60dd8bd7 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/60dd8bd7 Diff: http://git-wip-us.apache.

[09/11] git commit: ACCUMULO-1833 Account for race condition in test where mutations are flushed immediately.

ACCUMULO-1833 Account for race condition in test where mutations are flushed immediately. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/404e955e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/404e955e Diff

[06/11] git commit: ACCUMULO-1858 Fixed compilation error from bad merge.

ACCUMULO-1858 Fixed compilation error from bad merge. The old merge&push bit me as I was missing a '}'. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a7c5b72d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree

[02/11] Merge remote-tracking branch 'apache-committers/1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

http://git-wip-us.apache.org/repos/asf/accumulo/blob/04f81b50/server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java -- diff --cc server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java ind

[5/9] git commit: Merge branch '1.5.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.1-SNAPSHOT

Merge branch '1.5.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.1-SNAPSHOT Conflicts: examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchWriter.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://

[2/9] Merge remote-tracking branch 'apache-committers/1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

http://git-wip-us.apache.org/repos/asf/accumulo/blob/04f81b50/server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java -- diff --cc server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java ind

[7/9] git commit: ACCUMULO-1892 redo resolving conflict resolution from 1.4 merge

ACCUMULO-1892 redo resolving conflict resolution from 1.4 merge Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/60dd8bd7 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/60dd8bd7 Diff: http://git-wip-us.apache.

[1/9] git commit: ACCUMULO-1858 Backport ZooKeeper clean up to 1.4 and 1.5.

Updated Branches: refs/heads/1.6.0-SNAPSHOT 515cd9dfd -> c10ccf375 ACCUMULO-1858 Backport ZooKeeper clean up to 1.4 and 1.5. Fix cherry picks two commits: ACCUMULO-1379 - Adding close() to Instance to assist in freeing up resources (cherry picked from commit 7da1164d87227960d3e0cfc841f753067

[6/9] git commit: ACCUMULO-1858 Fixed compilation error from bad merge.

ACCUMULO-1858 Fixed compilation error from bad merge. The old merge&push bit me as I was missing a '}'. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a7c5b72d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree

[9/9] git commit: Merge remote-tracking branch 'apache-committers/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge remote-tracking branch 'apache-committers/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Did a merge for ACCUMULO-1858 and picked some "Elser" slack. Conflicts: core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java server/base/src/main/java/org/apache/accumulo/se

[8/9] git commit: ACCUMULO-1833 Account for race condition in test where mutations are flushed immediately.

ACCUMULO-1833 Account for race condition in test where mutations are flushed immediately. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/404e955e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/404e955e Diff

git commit: ACCUMULO-1833 Account for race condition in test where mutations are flushed immediately.

Updated Branches: refs/heads/1.5.1-SNAPSHOT 60dd8bd73 -> 404e955ec ACCUMULO-1833 Account for race condition in test where mutations are flushed immediately. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/404e955e T

git commit: ACCUMULO-1892 redo resolving conflict resolution from 1.4 merge

Updated Branches: refs/heads/1.5.1-SNAPSHOT a7c5b72d3 -> 60dd8bd73 ACCUMULO-1892 redo resolving conflict resolution from 1.4 merge Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/60dd8bd7 Tree: http://git-wip-us.apac

git commit: ACCUMULO-1833 Fix merge to 1.6.0 regarding TCredentials->Credentials

Updated Branches: refs/heads/1.6.0-SNAPSHOT 45fbee693 -> 515cd9dfd ACCUMULO-1833 Fix merge to 1.6.0 regarding TCredentials->Credentials Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/515cd9df Tree: http://git-wip-us

git commit: ACCUMULO-1858 Fixed compilation error from bad merge.

Updated Branches: refs/heads/1.5.1-SNAPSHOT 036f381fb -> a7c5b72d3 ACCUMULO-1858 Fixed compilation error from bad merge. The old merge&push bit me as I was missing a '}'. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/com

[5/5] git commit: Merge branch '1.5.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.1-SNAPSHOT

Merge branch '1.5.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.1-SNAPSHOT Conflicts: examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchWriter.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://

[2/5] Merge remote-tracking branch 'apache-committers/1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

http://git-wip-us.apache.org/repos/asf/accumulo/blob/04f81b50/server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java -- diff --cc server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java ind

[1/5] git commit: ACCUMULO-1858 Backport ZooKeeper clean up to 1.4 and 1.5.

Updated Branches: refs/heads/1.5.1-SNAPSHOT 6b87c870d -> 036f381fb ACCUMULO-1858 Backport ZooKeeper clean up to 1.4 and 1.5. Fix cherry picks two commits: ACCUMULO-1379 - Adding close() to Instance to assist in freeing up resources (cherry picked from commit 7da1164d87227960d3e0cfc841f753067

git commit: ACCUMULO-1858 Backport ZooKeeper clean up to 1.4 and 1.5.

Updated Branches: refs/heads/1.4.5-SNAPSHOT a40a6d423 -> 79d686faa ACCUMULO-1858 Backport ZooKeeper clean up to 1.4 and 1.5. Fix cherry picks two commits: ACCUMULO-1379 - Adding close() to Instance to assist in freeing up resources (cherry picked from commit 7da1164d87227960d3e0cfc841f753067