[02/10] accumulo git commit: ACCUMULO-3946 Added missing audits on security operations.

ACCUMULO-3946 Added missing audits on security operations. Signed-off-by: Josh Elser Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dad7c7c9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dad7c7c9 Diff: ht

[09/10] accumulo git commit: Merge branch '1.6' into 1.7

Merge branch '1.6' into 1.7 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d5d883cb Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d5d883cb Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d5d883cb

[07/10] accumulo git commit: Merge branch '1.5' into 1.6

Merge branch '1.5' into 1.6 Conflicts: server/src/main/java/org/apache/accumulo/server/master/Master.java server/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java

[10/10] accumulo git commit: Merge branch '1.7'

Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7c146e0f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7c146e0f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7c146e0f Branch:

[04/10] accumulo git commit: ACCUMULO-3946 Added missing audits on security operations.

ACCUMULO-3946 Added missing audits on security operations. Signed-off-by: Josh Elser Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dad7c7c9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dad7c7c9 Diff: ht

[03/10] accumulo git commit: ACCUMULO-3946 Added missing audits on security operations.

ACCUMULO-3946 Added missing audits on security operations. Signed-off-by: Josh Elser Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dad7c7c9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dad7c7c9 Diff: ht

[06/10] accumulo git commit: Merge branch '1.5' into 1.6

Merge branch '1.5' into 1.6 Conflicts: server/src/main/java/org/apache/accumulo/server/master/Master.java server/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java

[05/10] accumulo git commit: Merge branch '1.5' into 1.6

Merge branch '1.5' into 1.6 Conflicts: server/src/main/java/org/apache/accumulo/server/master/Master.java server/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java

[08/10] accumulo git commit: Merge branch '1.6' into 1.7

Merge branch '1.6' into 1.7 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d5d883cb Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d5d883cb Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d5d883cb

[01/10] accumulo git commit: ACCUMULO-3946 Added missing audits on security operations.

Repository: accumulo Updated Branches: refs/heads/1.5 262decd3c -> dad7c7c93 refs/heads/1.6 6425c37dc -> 00c275b1f refs/heads/1.7 e4f1df327 -> d5d883cbb refs/heads/master 89f44e24f -> 7c146e0fc ACCUMULO-3946 Added missing audits on security operations. Signed-off-by: Josh Elser Projec

svn commit: r962392 - in /websites/production/accumulo/content: ./ 1.4/apidocs/ 1.5/apidocs/ 1.6/apidocs/ 1.7/apidocs/

Author: elserj Date: Wed Aug 19 22:41:09 2015 New Revision: 962392 Log: Publishing svnmucc operation to accumulo site by elserj Added: websites/production/accumulo/content/ - copied from r962391, websites/staging/accumulo/trunk/content/ websites/production/accumulo/content/1.4/apido

svn commit: r962391 - in /websites/staging/accumulo/trunk/content: ./ people.html

Author: buildbot Date: Wed Aug 19 22:40:12 2015 New Revision: 962391 Log: Staging update by buildbot for accumulo Modified: websites/staging/accumulo/trunk/content/ (props changed) websites/staging/accumulo/trunk/content/people.html Propchange: websites/staging/accumulo/trunk/content/

svn commit: r1696685 - /accumulo/site/trunk/content/people.mdtext

Author: elserj Date: Wed Aug 19 22:39:59 2015 New Revision: 1696685 URL: http://svn.apache.org/r1696685 Log: Trying to resolve conflicts Modified: accumulo/site/trunk/content/people.mdtext Modified: accumulo/site/trunk/content/people.mdtext URL: http://svn.apache.org/viewvc/accumulo/site/tr