You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/05/28 22:51:48 UTC

[15/32] git commit: Merge branch '1.6.1-SNAPSHOT'

Merge branch '1.6.1-SNAPSHOT'


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

Branch: refs/heads/ACCUMULO-378
Commit: 3411023a94b0d460b2bf57f0997247cebaf6e9dc
Parents: 20a466b ff3ad73
Author: Keith Turner <kt...@apache.org>
Authored: Fri May 23 16:32:01 2014 -0400
Committer: Keith Turner <kt...@apache.org>
Committed: Fri May 23 16:32:01 2014 -0400

----------------------------------------------------------------------
 .../core/conf/DefaultConfiguration.java         |  2 +-
 .../impl/MiniAccumuloClusterImpl.java           |  8 ++++
 minicluster/src/main/resources/auditLog.xml     | 41 ++++++++++++++++++++
 .../security/AuditedSecurityOperation.java      |  3 +-
 4 files changed, 52 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/3411023a/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3411023a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
----------------------------------------------------------------------