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

2014-02-28 Thread bhavanki
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/11d724e8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/11d724e8 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/11d724

[5/6] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

2014-02-28 Thread bhavanki
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: server/src/main/java/org/apache/accumulo/server/master/Master.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/18a55009 Tree: http://git-wip-us.ap

[4/6] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

2014-02-28 Thread bhavanki
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: server/src/main/java/org/apache/accumulo/server/master/Master.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/18a55009 Tree: http://git-wip-us.ap

[1/6] git commit: ACCUMULO-2422 Refine renewal of master lock watcher

2014-02-28 Thread bhavanki
Repository: accumulo Updated Branches: refs/heads/1.5.1-SNAPSHOT 853ed5bb2 -> 7eeff02c7 refs/heads/1.6.0-SNAPSHOT 04d8cd8d4 -> 18a55009e refs/heads/master 2b3202aee -> 11d724e87 ACCUMULO-2422 Refine renewal of master lock watcher The first commit for ACCUMULO-2422 succeeds in renewing the

[3/6] git commit: ACCUMULO-2422 Refine renewal of master lock watcher

2014-02-28 Thread bhavanki
ACCUMULO-2422 Refine renewal of master lock watcher The first commit for ACCUMULO-2422 succeeds in renewing the watch on another master's lock node when needed. This commit refines the solution: - The renewal was happening even after the master is able to acquire the lock. This led to a spuri

[2/6] git commit: ACCUMULO-2422 Refine renewal of master lock watcher

2014-02-28 Thread bhavanki
ACCUMULO-2422 Refine renewal of master lock watcher The first commit for ACCUMULO-2422 succeeds in renewing the watch on another master's lock node when needed. This commit refines the solution: - The renewal was happening even after the master is able to acquire the lock. This led to a spuri

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

2014-02-28 Thread bhavanki
Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 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/04d8cd8d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0

[1/3] git commit: ACCUMULO-2421 Add table name to error message

2014-02-28 Thread bhavanki
Repository: accumulo Updated Branches: refs/heads/master 07604ca05 -> 2b3202aee ACCUMULO-2421 Add table name to error message Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bd970de8 Tree: http://git-wip-us.apache.or

[3/3] git commit: Merge remote-tracking branch 'origin/1.6.0-SNAPSHOT' (for ACCUMULO-2421).

2014-02-28 Thread bhavanki
Merge remote-tracking branch 'origin/1.6.0-SNAPSHOT' (for ACCUMULO-2421). Conflicts: core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2b3202ae T

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

2014-02-28 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/07604ca0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/07604ca0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/07604c

[3/4] git commit: ACCUMULO-2422 reset watch on non-delete events

2014-02-28 Thread ecn
ACCUMULO-2422 reset watch on non-delete events Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7d70ef58 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7d70ef58 Diff: http://git-wip-us.apache.org/repos/asf/acc

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

2014-02-28 Thread ecn
Merge branch '1.5.1-SNAPSHOT' into 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/a12bde88 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a12bde88 Diff: http://git-wip-us.apache.org/repos/asf/

[1/4] git commit: ACCUMULO-2422 reset watch on non-delete events

2014-02-28 Thread ecn
Repository: accumulo Updated Branches: refs/heads/master 90b661991 -> 07604ca05 ACCUMULO-2422 reset watch on non-delete events Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/853ed5bb Tree: http://git-wip-us.apache.o

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

2014-02-28 Thread ecn
Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 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/04d8cd8d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0

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

2014-02-28 Thread ecn
Merge branch '1.5.1-SNAPSHOT' into 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/a12bde88 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a12bde88 Diff: http://git-wip-us.apache.org/repos/asf/

[3/4] git commit: ACCUMULO-2422 reset watch on non-delete events

2014-02-28 Thread ecn
ACCUMULO-2422 reset watch on non-delete events Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7d70ef58 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7d70ef58 Diff: http://git-wip-us.apache.org/repos/asf/acc

[1/4] git commit: ACCUMULO-2422 reset watch on non-delete events

2014-02-28 Thread ecn
Repository: accumulo Updated Branches: refs/heads/1.6.0-SNAPSHOT bd970de81 -> 04d8cd8d4 ACCUMULO-2422 reset watch on non-delete events Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/853ed5bb Tree: http://git-wip-us.

git commit: ACCUMULO-2422 reset watch on non-delete events

2014-02-28 Thread ecn
Repository: accumulo Updated Branches: refs/heads/1.5.1-SNAPSHOT 5dba407cc -> 853ed5bb2 ACCUMULO-2422 reset watch on non-delete events Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/853ed5bb Tree: http://git-wip-us.