[05/10] accumulo git commit: Merge branch '1.6' into 1.7

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

[05/10] accumulo git commit: Merge branch '1.6' into 1.7

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

[05/10] accumulo git commit: Merge branch '1.6' into 1.7

Merge branch '1.6' into 1.7 Conflicts: server/native/src/main/resources/Makefile Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a7b482ad Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a7b482ad Diff:

[05/10] accumulo git commit: Merge branch '1.6' into 1.7

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

[05/10] accumulo git commit: Merge branch '1.6' into 1.7

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

[05/10] accumulo git commit: Merge branch '1.6' into 1.7

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

[05/10] accumulo git commit: Merge branch '1.6' into 1.7

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

[05/10] accumulo git commit: Merge branch '1.6' into 1.7

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

[05/10] accumulo git commit: Merge branch '1.6' into 1.7

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

[05/10] accumulo git commit: Merge branch '1.6' into 1.7

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

[05/10] accumulo git commit: Merge branch '1.6' into 1.7

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

[05/10] accumulo git commit: Merge branch '1.6' into 1.7

Merge branch '1.6' into 1.7 Conflicts: LICENSE Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7b920536 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7b920536 Diff: http://git-wip-us.apache.org/rep