[5/6] accumulo git commit: Merge branch '1.6' into 1.7

Merge branch '1.6' into 1.7 Conflicts: examples/simple/.gitignore fate/.gitignore maven-plugin/.gitignore minicluster/.gitignore pom.xml proxy/.gitignore server/tracer/.gitignore trace/.gitignore Project:

[1/6] accumulo git commit: ACCUMULO-4121 Better configuration for netbeans.

Repository: accumulo Updated Branches: refs/heads/1.6 21d2f6152 -> 8c5607e2a refs/heads/1.7 d4882a15f -> 5596b016c refs/heads/master 4eadac16b -> 7a6b48203 ACCUMULO-4121 Better configuration for netbeans. Added typical files for a maven project to all .gitignores Also excluded those

[2/6] accumulo git commit: ACCUMULO-4121 Better configuration for netbeans.

ACCUMULO-4121 Better configuration for netbeans. Added typical files for a maven project to all .gitignores Also excluded those files in the rat plugin section of the pom.xml files. Not excluded by default, see http://creadur.apache.org/rat/apache-rat-plugin/check-mojo.html#useDefaultExcludes

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

Merge branch '1.7' Conflicts: core/.gitignore minicluster/.gitignore start/.gitignore Closes apache/accumulo#66 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7a6b4820 Tree:

[4/6] accumulo git commit: Merge branch '1.6' into 1.7

Merge branch '1.6' into 1.7 Conflicts: examples/simple/.gitignore fate/.gitignore maven-plugin/.gitignore minicluster/.gitignore pom.xml proxy/.gitignore server/tracer/.gitignore trace/.gitignore Project:

[3/6] accumulo git commit: ACCUMULO-4121 Better configuration for netbeans.

ACCUMULO-4121 Better configuration for netbeans. Added typical files for a maven project to all .gitignores Also excluded those files in the rat plugin section of the pom.xml files. Not excluded by default, see http://creadur.apache.org/rat/apache-rat-plugin/check-mojo.html#useDefaultExcludes