[2/6] git commit: ACCUMULO-2438 Backport the changes to ensure that we watch separate sets of tables for merges

2014-03-09 Thread elserj
ACCUMULO-2438 Backport the changes to ensure that we watch separate sets of tables for merges Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/12b53b04 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/12b53b04

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

2014-03-09 Thread elserj
Merge branch '1.5.2-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/a63e7c9b Tree:

[3/6] git commit: ACCUMULO-2438 Backport the changes to ensure that we watch separate sets of tables for merges

2014-03-09 Thread elserj
ACCUMULO-2438 Backport the changes to ensure that we watch separate sets of tables for merges Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/12b53b04 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/12b53b04

[1/6] git commit: ACCUMULO-2438 Backport the changes to ensure that we watch separate sets of tables for merges

2014-03-09 Thread elserj
Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT 18006d245 - 12b53b043 refs/heads/1.6.0-SNAPSHOT 0297276e6 - a63e7c9b9 refs/heads/master 96d54e673 - f3083c7bb ACCUMULO-2438 Backport the changes to ensure that we watch separate sets of tables for merges Project:

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

2014-03-09 Thread elserj
Merge branch '1.5.2-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/a63e7c9b Tree:

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

2014-03-09 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/f3083c7b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f3083c7b Diff: