So why are you suggesting it ;-) I say we stick to plain Git workflows until we all get a good feel for it ;-)
Gary On Thu, Sep 4, 2014 at 12:43 PM, Matt Sicker <[email protected]> wrote: > You can amend them and force push them, but it's frowned upon because it > screws up everyone's own git repositories. > > > On 4 September 2014 11:23, Remko Popma <[email protected]> wrote: > >> Darn! I should have written LOG4J2-796 instead of 807. >> Is there any way to fix a commit message? >> >> >> On Fri, Sep 5, 2014 at 1:18 AM, <[email protected]> wrote: >> >>> Repository: logging-log4j2 >>> Updated Branches: >>> refs/heads/master 114ae7526 -> e54cb498d >>> >>> >>> LOG4J2-807: Fixed issue where log4j-to-slf4j did not work correctly with >>> SLF4J Simple Logger >>> >>> Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo >>> Commit: >>> http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/33fdc826 >>> Tree: >>> http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/33fdc826 >>> Diff: >>> http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/33fdc826 >>> >>> Branch: refs/heads/master >>> Commit: 33fdc82669899fca266dda91ce607b574101562b >>> Parents: 28e1062 >>> Author: remko <[email protected]> >>> Authored: Thu Sep 4 23:33:11 2014 +0900 >>> Committer: remko <[email protected]> >>> Committed: Thu Sep 4 23:33:11 2014 +0900 >>> >>> ---------------------------------------------------------------------- >>> .../main/java/org/apache/logging/slf4j/SLF4JLogger.java | 12 >>> ++++++------ >>> src/changes/changes.xml | 3 +++ >>> 2 files changed, 9 insertions(+), 6 deletions(-) >>> ---------------------------------------------------------------------- >>> >>> >>> >>> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/33fdc826/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLogger.java >>> ---------------------------------------------------------------------- >>> diff --git >>> a/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLogger.java >>> b/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLogger.java >>> index 921ab17..34f3bef 100644 >>> --- >>> a/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLogger.java >>> +++ >>> b/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLogger.java >>> @@ -161,22 +161,22 @@ public class SLF4JLogger extends AbstractLogger { >>> } else { >>> switch (level.getStandardLevel()) { >>> case DEBUG : >>> - logger.debug(fqcn, getMarker(marker), >>> message.getFormattedMessage(), message.getParameters(), t); >>> + logger.debug(getMarker(marker), >>> message.getFormattedMessage(), message.getParameters(), t); >>> break; >>> case TRACE : >>> - logger.trace(fqcn, getMarker(marker), >>> message.getFormattedMessage(), message.getParameters(), t); >>> + logger.trace(getMarker(marker), >>> message.getFormattedMessage(), message.getParameters(), t); >>> break; >>> case INFO : >>> - logger.info(fqcn, getMarker(marker), >>> message.getFormattedMessage(), message.getParameters(), t); >>> + logger.info(getMarker(marker), >>> message.getFormattedMessage(), message.getParameters(), t); >>> break; >>> case WARN : >>> - logger.warn(fqcn, getMarker(marker), >>> message.getFormattedMessage(), message.getParameters(), t); >>> + logger.warn(getMarker(marker), >>> message.getFormattedMessage(), message.getParameters(), t); >>> break; >>> case ERROR : >>> - logger.error(fqcn, getMarker(marker), >>> message.getFormattedMessage(), message.getParameters(), t); >>> + logger.error(getMarker(marker), >>> message.getFormattedMessage(), message.getParameters(), t); >>> break; >>> default : >>> - logger.error(fqcn, getMarker(marker), >>> message.getFormattedMessage(), message.getParameters(), t); >>> + logger.error(getMarker(marker), >>> message.getFormattedMessage(), message.getParameters(), t); >>> break; >>> } >>> } >>> >>> >>> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/33fdc826/src/changes/changes.xml >>> ---------------------------------------------------------------------- >>> diff --git a/src/changes/changes.xml b/src/changes/changes.xml >>> index fd0d5bf..3ea34b8 100644 >>> --- a/src/changes/changes.xml >>> +++ b/src/changes/changes.xml >>> @@ -24,6 +24,9 @@ >>> </properties> >>> <body> >>> <release version="2.?.?" date="2014-??-??" description="Bug fixes >>> and enhancements"> >>> + <action issue="LOG4J2-807" dev="rpopma" type="fix"> >>> + Fixed issue where log4j-to-slf4j did not work correctly with >>> SLF4J Simple Logger. >>> + </action> >>> <action issue="LOG4J2-811" dev="ggregory" type="fix" >>> due-to="Yogesh Rao"> >>> SimpleLogger throws ArrayIndexOutOfBoundsException for an empty >>> array. >>> </action> >>> >>> >> > > > -- > Matt Sicker <[email protected]> > -- E-Mail: [email protected] | [email protected] Java Persistence with Hibernate, Second Edition <http://www.manning.com/bauer3/> JUnit in Action, Second Edition <http://www.manning.com/tahchiev/> Spring Batch in Action <http://www.manning.com/templier/> Blog: http://garygregory.wordpress.com Home: http://garygregory.com/ Tweet! http://twitter.com/GaryGregory
