[slf4j-dev] [GIT] SLF4J: Simple Logging Facade for Java branch master updated. v_1.6.6-8-ga6f12c7

Gitbot git-noreply at pixie.qos.ch
Sat Jun 23 12:22:35 CEST 2012

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SLF4J: Simple Logging Facade for Java".

The branch, master has been updated
       via  a6f12c712182cd6fa8fa2199462b625cbe61c0bf (commit)
       via  cf897a9b8841c095a267ff37c5d45cf2627d93f0 (commit)
      from  3fda35416bd04d8edd69a210709be329084e6960 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------

commit a6f12c712182cd6fa8fa2199462b625cbe61c0bf
Merge: 3fda354 cf897a9
Author: Ceki Gulcu <ceki at qos.ch>
Date:   Sat Jun 23 03:20:04 2012 -0700

    Merge pull request #19 from geofflane/master
    Fix typo


commit cf897a9b8841c095a267ff37c5d45cf2627d93f0
Author: Geoff Lane <geoff at zorched.net>
Date:   Fri Jun 22 13:26:41 2012 -0300

    Fix typo merker -> marker

diff --git a/slf4j-api/src/main/java/org/slf4j/helpers/BasicMarker.java b/slf4j-api/src/main/java/org/slf4j/helpers/BasicMarker.java
index c33b2b5..6474d48 100644
--- a/slf4j-api/src/main/java/org/slf4j/helpers/BasicMarker.java
+++ b/slf4j-api/src/main/java/org/slf4j/helpers/BasicMarker.java
@@ -46,7 +46,7 @@ public class BasicMarker implements Marker {
   BasicMarker(String name) {
     if (name == null) {
-      throw new IllegalArgumentException("A merker name cannot be null");
+      throw new IllegalArgumentException("A marker name cannot be null");
     this.name = name;


Summary of changes:
 .../main/java/org/slf4j/helpers/BasicMarker.java   |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

SLF4J: Simple Logging Facade for Java

More information about the slf4j-dev mailing list