[3/3] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bdb27e97 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bdb27e97 Diff:

[3/3] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Conflicts: test/src/main/java/org/apache/accumulo/test/functional/ConcurrentDeleteTableIT.java test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

[3/3] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/271800c3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/271800c3 Diff:

[3/3] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/711b4211 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/711b4211 Diff:

[3/3] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/24289e2c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/24289e2c Diff:

[3/3] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ec69f299 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ec69f299 Diff:

[3/3] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c8621bbc Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c8621bbc Diff:

[3/3] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/135bf025 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/135bf025 Diff:

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

Merge branch '1.7' Conflicts: assemble/bin/start-server.sh Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9d917389 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9d917389 Diff:

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

Merge branch '1.7' Conflicts: server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/31a4a7e7 Tree:

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

Merge branch '1.7' Conflicts: test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cf9b9a4e Tree:

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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

[3/3] accumulo git commit: Merge branch '1.7'

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