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

[elserj]

Merge branch '1.6' into 1.7

Conflicts:
        test/src/test/java/org/apache/accumulo/test/AuditMessageIT.java


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/071c32f5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/071c32f5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/071c32f5

Branch: refs/heads/master
Commit: 071c32f5cf20e37c4d930ad188eff8fff700ac0f
Parents: d5d883c a541e76
Author: Josh Elser <els...@apache.org>
Authored: Thu Aug 20 18:40:03 2015 -0400
Committer: Josh Elser <els...@apache.org>
Committed: Thu Aug 20 18:40:03 2015 -0400

----------------------------------------------------------------------
 .../server/security/AuditedSecurityOperation.java     |  2 +-
 .../java/org/apache/accumulo/test/AuditMessageIT.java | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/071c32f5/server/base/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/071c32f5/test/src/test/java/org/apache/accumulo/test/AuditMessageIT.java
----------------------------------------------------------------------
diff --cc test/src/test/java/org/apache/accumulo/test/AuditMessageIT.java
index 14361a6,2896267..268965f
--- a/test/src/test/java/org/apache/accumulo/test/AuditMessageIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/AuditMessageIT.java
@@@ -81,10 -80,8 +81,11 @@@ public class AuditMessageIT extends Con
  
    @Override
    public void beforeClusterStart(MiniAccumuloConfigImpl cfg) throws Exception 
{
 +    File f = new File(cfg.getConfDir(), "auditLog.xml");
 +    if (f.delete()) {
 +      log.debug("Deleted " + f);
 +    }
+     cfg.setNumTservers(1);
 -    new File(cfg.getConfDir(), "auditLog.xml").delete();
    }
  
    // Must be static to survive Junit re-initialising the class every time.