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/08/07 00:26:55 UTC

[5/5] 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/dbcf984b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dbcf984b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dbcf984b

Branch: refs/heads/master
Commit: dbcf984b2abf293000c66228703798c973c3270a
Parents: 7c047e1 cc30021
Author: Josh Elser <el...@apache.org>
Authored: Wed Aug 6 18:18:00 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Wed Aug 6 18:18:00 2014 -0400

----------------------------------------------------------------------
 .../server/security/AuditedSecurityOperation.java  | 17 ++++++++++++++++-
 .../server/security/SecurityOperation.java         |  2 +-
 2 files changed, 17 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


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