ACCUMULO-4142 Update copyright dates in NOTICEs
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bac90d99
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bac90d99
Diff: http://git-wip-us.apache.org/repos/asf/ac
Merge branch '1.6' into 1.7
Conflicts:
server/base/src/main/java/org/apache/accumulo/server/master/state/CurrentState.java
server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java
server/master/src/main/java/org/apache/accumulo/master/Ma
Merge branch '1.6' into 1.7
Conflicts:
server/base/src/main/java/org/apache/accumulo/server/master/state/CurrentState.java
server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java
server/master/src/main/java/org/apache/accumulo/master/Ma
ACCUMULO-4143 Make protective copy of migrations
Makes a protective copy of the master's migrations, when requested, to prevent
ConcurrentModificationExceptions when the requestor iterates over the set at the
same time the master is updating it.
This closes #68
Project: http://git-wip-us.apache
Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a6e6e672
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a6e6e672
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a6e6e672
Branch:
Repository: accumulo
Updated Branches:
refs/heads/1.6 bac90d99d -> f1e4f9a3a
refs/heads/1.7 a2b15bfa9 -> 69185edb1
refs/heads/master 8949fd460 -> a6e6e6723
ACCUMULO-4142 Update copyright dates in NOTICEs
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-
ACCUMULO-4143 Make protective copy of migrations
Makes a protective copy of the master's migrations, when requested, to prevent
ConcurrentModificationExceptions when the requestor iterates over the set at the
same time the master is updating it.
This closes #68
Project: http://git-wip-us.apache
ACCUMULO-4143 Make protective copy of migrations
Makes a protective copy of the master's migrations, when requested, to prevent
ConcurrentModificationExceptions when the requestor iterates over the set at the
same time the master is updating it.
This closes #68
Project: http://git-wip-us.apache
Repository: accumulo
Updated Branches:
refs/heads/1.6 d36e317a8 -> bac90d99d
ACCUMULO-4142 Update copyright dates in NOTICEs
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bac90d99
Tree: http://git-wip-us.apache.org