[2/2] 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 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/db367679 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d

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

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/494d6947 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/494d6947 Diff: http://git-wip-us.apache.org/repos/asf/

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

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/6c91e349 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6c91e349 Diff: http://git-wip-us.apache.org/repos/asf/

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

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7908193f Tree: http:

[2/2] 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 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b0d58088 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b

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

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

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

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/99ebfc7f

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

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

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

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java test/src/test/java/org/apache/accumulo/test/functional/CleanUpIT.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http

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

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

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

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

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

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: pom.xml Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4c2652b2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4c2652b2 Diff: http://git-

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

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/4de0c1d4 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4de0c1d4 Diff: http://git-wip-us.apache.org/repos/asf/

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

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fda6d9c1 Tree: http://git-wip-us

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

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

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

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: conf/examples/1GB/native-standalone/accumulo-env.sh conf/examples/1GB/standalone/accumulo-env.sh conf/examples/2GB/native-standalone/accumulo-env.sh conf/examples/2GB/standalone/accumulo-env.sh con

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

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: examples/simple/pom.xml Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/352dc1b8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/352dc1b8 D

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

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/5a179cf8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5a179cf8 Diff: http://git-wip-us.apache.org/repos/asf/

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

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

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

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

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

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/360f0cf8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/360f0cf8 Diff: http://git-wip-us.apache.org/repos/asf/

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

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/29223f79 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/29223f79 Diff: http://git-wip-us.apache.org/repos/asf/

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

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/387fcfbe Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/387fcfbe Diff: http://git-wip-us.apache.org/repos/asf/

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

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f478737a Tree: http://git-wip-us

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

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

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

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/45fbee69 Tree:

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

Merge branch '1.5.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c6229e12 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c6229e12 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c6229e

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

Merge branch '1.5.1-SNAPSHOT' Conflicts: core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/32f423e6 Tree: http://git-wip-us.apache.

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

Merge branch '1.5.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fb829454 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fb829454 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fb8294

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

Merge branch '1.5.1-SNAPSHOT' Conflicts: server/src/test/java/org/apache/accumulo/server/tabletserver/TabletServerSyncCheckTest.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4ccf2421 Tree: http://git-wip

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

Merge branch '1.5.1-SNAPSHOT' Conflicts: server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java ACCUMULO-1637 Expanding the tests to account for the VolumeManager changes in 1.6 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip

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

Merge branch '1.5.1-SNAPSHOT' Conflicts: server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java I had fixed this in master when resolving the merge conflict, but not in 1.5.1 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us

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

Merge branch '1.5.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5b2a5825 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5b2a5825 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5b2a58

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

Merge branch '1.5.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cf41bdcc Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cf41bdcc Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cf41bd

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

Merge branch '1.5.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3ad3f8b3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3ad3f8b3 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3ad3f8

[2/2] 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 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f9efaf19 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f

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

Merge branch '1.5.1-SNAPSHOT' Conflicts: server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-u

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

Merge branch '1.5.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/77cac56e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/77cac56e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/77cac5

[2/2] 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 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/44dfbf91 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4