[07/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:

[07/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:

[07/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

[07/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:

[07/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:

[07/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:

[07/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:

[07/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:

[07/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: