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

[elserj]

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

Branch: refs/heads/master
Commit: 814813421af9fee2c5f361588224d336919cd7b0
Parents: f228caf 001fdd6
Author: Josh Elser <els...@apache.org>
Authored: Wed Dec 18 17:02:07 2013 -0500
Committer: Josh Elser <els...@apache.org>
Committed: Wed Dec 18 17:02:07 2013 -0500

----------------------------------------------------------------------
 .../main/java/org/apache/accumulo/core/security/SecurityUtil.java   | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/81481342/core/src/main/java/org/apache/accumulo/core/security/SecurityUtil.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/security/SecurityUtil.java
index 4ffcc36,672e784..59c1974
--- a/core/src/main/java/org/apache/accumulo/core/security/SecurityUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/SecurityUtil.java
@@@ -29,7 -29,9 +29,8 @@@ import org.apache.log4j.Logger
   */
  public class SecurityUtil {
    private static final Logger log = Logger.getLogger(SecurityUtil.class);
 -  private static final String ACCUMULO_HOME = "ACCUMULO_HOME", 
ACCUMULO_CONF_DIR = "ACCUMULO_CONF_DIR";
    public static boolean usingKerberos = false;
+ 
    /**
     * This method is for logging a server in kerberos. If this is used in 
client code, it will fail unless run as the accumulo keytab's owner. Instead, 
use
     * {@link #login(String, String)}