Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge -r 1362150:1362151 from trunk to branch. FIXES: HADOOP-8552 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362152 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Alejandro Abdelnur 2012-07-16 17:29:54 +00:00
parent fa26901c01
commit 5b64da5b53
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -155,6 +155,9 @@ Release 2.0.1-alpha - UNRELEASED
HADOOP-8585. Fix initialization circularity between UserGroupInformation
and HadoopConfiguration. (Colin Patrick McCabe via atm)
HADOOP-8552. Conflict: Same security.log.file for multiple users.
(kkambatl via tucu)
BREAKDOWN OF HDFS-3042 SUBTASKS
HADOOP-8220. ZKFailoverController doesn't handle failure to become active

2
hadoop-common-project/hadoop-common/src/main/conf/log4j.properties
View File

@ -106,7 +106,7 @@ hadoop.security.logger=INFO,NullAppender
hadoop.security.log.maxfilesize=256MB
hadoop.security.log.maxbackupindex=20
log4j.category.SecurityLogger=${hadoop.security.logger}
hadoop.security.log.file=SecurityAuth.audit
hadoop.security.log.file=SecurityAuth-${user.name}.audit
log4j.appender.RFAS=org.apache.log4j.RollingFileAppender
log4j.appender.RFAS.File=${hadoop.log.dir}/${hadoop.security.log.file}
log4j.appender.RFAS.layout=org.apache.log4j.PatternLayout

2
hadoop-common-project/hadoop-common/src/main/packages/templates/conf/log4j.properties
View File

@ -106,7 +106,7 @@ hadoop.security.logger=INFO,NullAppender
hadoop.security.log.maxfilesize=256MB
hadoop.security.log.maxbackupindex=20
log4j.category.SecurityLogger=${hadoop.security.logger}
hadoop.security.log.file=SecurityAuth.audit
hadoop.security.log.file=SecurityAuth-${user.name}.audit
log4j.appender.RFAS=org.apache.log4j.RollingFileAppender
log4j.appender.RFAS.File=${hadoop.log.dir}/${hadoop.security.log.file}
log4j.appender.RFAS.layout=org.apache.log4j.PatternLayout