[06/10] 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-site.xml conf/examples/1GB/standalone/accumulo-site.xml conf/examples/2GB/native-standalone/accumulo-site.xml conf/examples/2GB/standalone/accumulo-site.xml

[08/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: bin/accumulo Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a55f5d3f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a55f5d3f Diff: http:/

[09/10] 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: bin/accumulo Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/152f1942 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/152f1942 Diff: http:/

[02/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/security/SecurityUtil.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/001fdd69 Tree: http://git-wip-u

[03/10] 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/security/SecurityUtil.java 1.6 should already interpolate correctly due to changes in Property and AccumuloConfiguration. Project: http://git-wip-us.apache.org/repos/asf/accumulo/re

[10/10] git commit: Merge branch '1.6.0-SNAPSHOT'

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

[04/10] git commit: ACCUMULO-2060 Add additional classpath entries that typically contain hadoop artifacts.

ACCUMULO-2060 Add additional classpath entries that typically contain hadoop artifacts. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/40df8cdb Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/40df8cdb Diff:

[07/10] git commit: ACCUMULO-2004 Check for libhadoop.so, not the a directory we think it might be in.

ACCUMULO-2004 Check for libhadoop.so, not the a directory we think it might be in. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/53a7d518 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/53a7d518 Diff: http:

[01/10] git commit: ACCUMULO-2058 Add shell env interpolation for ACCUMULO_CONF_DIR when extracting kerberos keytab value.

Updated Branches: refs/heads/master ad676c1e9 -> 3be435e9f ACCUMULO-2058 Add shell env interpolation for ACCUMULO_CONF_DIR when extracting kerberos keytab value. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/559b1

[3/3] 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: bin/accumulo Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/152f1942 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/152f1942 Diff: http:/

[1/3] git commit: ACCUMULO-2004 Check for libhadoop.so, not the a directory we think it might be in.

Updated Branches: refs/heads/1.6.0-SNAPSHOT 5d952c748 -> 152f1942e ACCUMULO-2004 Check for libhadoop.so, not the a directory we think it might be in. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/53a7d518 Tree: ht

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

Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: bin/accumulo Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a55f5d3f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a55f5d3f Diff: http:/

[1/2] git commit: ACCUMULO-2004 Check for libhadoop.so, not the a directory we think it might be in.

Updated Branches: refs/heads/1.5.1-SNAPSHOT 4bed94046 -> a55f5d3f0 ACCUMULO-2004 Check for libhadoop.so, not the a directory we think it might be in. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/53a7d518 Tree: ht

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

Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: bin/accumulo Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a55f5d3f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a55f5d3f Diff: http:/

[1/3] git commit: ACCUMULO-2060 Add additional classpath entries that typically contain hadoop artifacts.

Updated Branches: refs/heads/1.6.0-SNAPSHOT 814813421 -> 5d952c748 ACCUMULO-2060 Add additional classpath entries that typically contain hadoop artifacts. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/40df8cdb Tre

[3/3] 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-site.xml conf/examples/1GB/standalone/accumulo-site.xml conf/examples/2GB/native-standalone/accumulo-site.xml conf/examples/2GB/standalone/accumulo-site.xml

[1/2] git commit: ACCUMULO-2060 Add additional classpath entries that typically contain hadoop artifacts.

Updated Branches: refs/heads/1.5.1-SNAPSHOT 001fdd69b -> 4bed94046 ACCUMULO-2060 Add additional classpath entries that typically contain hadoop artifacts. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/40df8cdb Tre

git commit: ACCUMULO-2060 Add additional classpath entries that typically contain hadoop artifacts.

Updated Branches: refs/heads/1.4.5-SNAPSHOT 559b18bc7 -> 40df8cdbd ACCUMULO-2060 Add additional classpath entries that typically contain hadoop artifacts. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/40df8cdb Tre

[3/3] 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/security/SecurityUtil.java 1.6 should already interpolate correctly due to changes in Property and AccumuloConfiguration. Project: http://git-wip-us.apache.org/repos/asf/accumulo/re

[1/3] git commit: ACCUMULO-2058 Add shell env interpolation for ACCUMULO_CONF_DIR when extracting kerberos keytab value.

Updated Branches: refs/heads/1.6.0-SNAPSHOT f228caff4 -> 814813421 ACCUMULO-2058 Add shell env interpolation for ACCUMULO_CONF_DIR when extracting kerberos keytab value. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/comm

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

Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/security/SecurityUtil.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/001fdd69 Tree: http://git-wip-u

[1/2] git commit: ACCUMULO-2058 Add shell env interpolation for ACCUMULO_CONF_DIR when extracting kerberos keytab value.

Updated Branches: refs/heads/1.5.1-SNAPSHOT 2d97b875a -> 001fdd69b ACCUMULO-2058 Add shell env interpolation for ACCUMULO_CONF_DIR when extracting kerberos keytab value. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/comm

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

Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/security/SecurityUtil.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/001fdd69 Tree: http://git-wip-u

git commit: ACCUMULO-2058 Add shell env interpolation for ACCUMULO_CONF_DIR when extracting kerberos keytab value.

Updated Branches: refs/heads/1.4.5-SNAPSHOT adee0f129 -> 559b18bc7 ACCUMULO-2058 Add shell env interpolation for ACCUMULO_CONF_DIR when extracting kerberos keytab value. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/comm

[2/3] git commit: ACCUMULO-1980 No longer tries to use master to stop tserver if no masters

ACCUMULO-1980 No longer tries to use master to stop tserver if no masters Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f228caff Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f228caff Diff: http://git-wip-

[3/3] git commit: Merge branch '1.6.0-SNAPSHOT'

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

[1/3] git commit: ACCUMULO-2025 - splitting the tests caused duplicate tables being used. They now use unique tables and namespaces

Updated Branches: refs/heads/master 80f8439ab -> ad676c1e9 ACCUMULO-2025 - splitting the tests caused duplicate tables being used. They now use unique tables and namespaces Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/c

[1/2] git commit: ACCUMULO-2025 - splitting the tests caused duplicate tables being used. They now use unique tables and namespaces

Updated Branches: refs/heads/1.6.0-SNAPSHOT 3ec25dbe5 -> f228caff4 ACCUMULO-2025 - splitting the tests caused duplicate tables being used. They now use unique tables and namespaces Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/ac

[2/2] git commit: ACCUMULO-1980 No longer tries to use master to stop tserver if no masters

ACCUMULO-1980 No longer tries to use master to stop tserver if no masters Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f228caff Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f228caff Diff: http://git-wip-

[09/13] git commit: ACCUMULO-1986 merge failed to pull null pointer checks from 1.4

ACCUMULO-1986 merge failed to pull null pointer checks from 1.4 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2d97b875 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2d97b875 Diff: http://git-wip-us.apache.

[11/13] 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/3ec25dbe Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3ec25dbe Diff: http://git-wip-us.apache.org/repos/asf/

[04/13] git commit: ACCUMULO-1986 Add data integrity checks to Key and Mutation

ACCUMULO-1986 Add data integrity checks to Key and Mutation This change adds checks to the constructors for Key and Mutations which take in Thrift data structures to ensure that required fields are not null. These checks prevent creation of invalid objects from modified Thrift structures. Signed-

[10/13] git commit: ACCUMULO-1986 merge failed to pull null pointer checks from 1.4

ACCUMULO-1986 merge failed to pull null pointer checks from 1.4 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2d97b875 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2d97b875 Diff: http://git-wip-us.apache.

[13/13] git commit: Merge branch '1.6.0-SNAPSHOT'

Merge branch '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/80f8439a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/80f8439a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/80f843

[12/13] 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/3ec25dbe Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3ec25dbe Diff: http://git-wip-us.apache.org/repos/asf/

[02/13] git commit: ACCUMULO-1986 Add data integrity checks to Key and Mutation

ACCUMULO-1986 Add data integrity checks to Key and Mutation This change adds checks to the constructors for Key and Mutations which take in Thrift data structures to ensure that required fields are not null. These checks prevent creation of invalid objects from modified Thrift structures. Signed-

[08/13] git commit: ACCUMULO-1986 merge failed to pull null pointer checks from 1.4

ACCUMULO-1986 merge failed to pull null pointer checks from 1.4 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2d97b875 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2d97b875 Diff: http://git-wip-us.apache.

[03/13] git commit: ACCUMULO-1986 Add data integrity checks to Key and Mutation

ACCUMULO-1986 Add data integrity checks to Key and Mutation This change adds checks to the constructors for Key and Mutations which take in Thrift data structures to ensure that required fields are not null. These checks prevent creation of invalid objects from modified Thrift structures. Signed-

[01/13] git commit: ACCUMULO-1986 Add data integrity checks to Key and Mutation

Updated Branches: refs/heads/1.4.5-SNAPSHOT bec36bc3f -> adee0f129 refs/heads/1.5.1-SNAPSHOT 144d9d5bf -> 2d97b875a refs/heads/1.6.0-SNAPSHOT 5bb28edba -> 3ec25dbe5 refs/heads/master a23cd8ef4 -> 80f8439ab ACCUMULO-1986 Add data integrity checks to Key and Mutation This change adds check