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

Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8bcf3469 Tree: http://git-wip-

[1/6] git commit: ACCUMULO-2994 Add explicit prefixes for iterator scopes and remove unnecessary configuration parsing.

Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT 37af86793 -> b2fbc06e7 refs/heads/1.6.1-SNAPSHOT b0e090ea1 -> 8bcf34698 refs/heads/master bb24ea72c -> 3107627b7 ACCUMULO-2994 Add explicit prefixes for iterator scopes and remove unnecessary configuration parsing. When read

[2/6] git commit: ACCUMULO-2994 Add explicit prefixes for iterator scopes and remove unnecessary configuration parsing.

ACCUMULO-2994 Add explicit prefixes for iterator scopes and remove unnecessary configuration parsing. When reading the Accumulo configuration, all configuration entries for all scopes were read. This is highly unnecessary as all that was done was to warn against invalid table properties. Instea

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

Merge branch '1.6.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3107627b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3107627b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/310762

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

Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8bcf3469 Tree: http://git-wip-

[3/6] git commit: ACCUMULO-2994 Add explicit prefixes for iterator scopes and remove unnecessary configuration parsing.

ACCUMULO-2994 Add explicit prefixes for iterator scopes and remove unnecessary configuration parsing. When reading the Accumulo configuration, all configuration entries for all scopes were read. This is highly unnecessary as all that was done was to warn against invalid table properties. Instea