Branch: refs/heads/master
  Home:   https://github.com/qos-ch/slf4j
  Commit: 7552796aa666c11442713cba37e7fbc339bfa020
      
https://github.com/qos-ch/slf4j/commit/7552796aa666c11442713cba37e7fbc339bfa020
  Author: Alexander Dorokhine <adorokh...@google.com>
  Date:   2014-12-12 (Fri, 12 Dec 2014)

  Changed paths:
    M slf4j-api/src/main/java/org/slf4j/LoggerFactory.java
    M slf4j-api/src/main/java/org/slf4j/helpers/Util.java
    R slf4j-simple/src/test/java/org/slf4j/AutoNamedLoggerFieldTrialTest.java
    A slf4j-simple/src/test/java/org/slf4j/DetectLoggerNameMismatchTest.java
    R slf4j-simple/src/test/java/org/slf4j/ShapeTest.java
    R slf4j-simple/src/test/java/org/slf4j/shape/ShapeBase.java
    R slf4j-simple/src/test/java/org/slf4j/shape/Square.java

  Log Message:
  -----------
  Rename the auto-named logger field trial as a logger name mismatch detector.


  Commit: 1ad01916d869bf8df38d9c9226a800782e3d247f
      
https://github.com/qos-ch/slf4j/commit/1ad01916d869bf8df38d9c9226a800782e3d247f
  Author: Ceki Gulcu <c...@qos.ch>
  Date:   2014-12-13 (Sat, 13 Dec 2014)

  Changed paths:
    M slf4j-api/src/main/java/org/slf4j/LoggerFactory.java
    M slf4j-api/src/main/java/org/slf4j/helpers/Util.java
    R slf4j-simple/src/test/java/org/slf4j/AutoNamedLoggerFieldTrialTest.java
    A slf4j-simple/src/test/java/org/slf4j/DetectLoggerNameMismatchTest.java
    R slf4j-simple/src/test/java/org/slf4j/ShapeTest.java
    R slf4j-simple/src/test/java/org/slf4j/shape/ShapeBase.java
    R slf4j-simple/src/test/java/org/slf4j/shape/Square.java

  Log Message:
  -----------
  fix merge conflict with PR #93


  Commit: 175c8e41b7613fad5b3603faf8774b58c7d04337
      
https://github.com/qos-ch/slf4j/commit/175c8e41b7613fad5b3603faf8774b58c7d04337
  Author: Ceki Gulcu <c...@qos.ch>
  Date:   2014-12-13 (Sat, 13 Dec 2014)

  Changed paths:
    M slf4j-api/src/main/java/org/slf4j/LoggerFactory.java
    M slf4j-api/src/main/java/org/slf4j/helpers/Util.java
    R slf4j-simple/src/test/java/org/slf4j/AutoNamedLoggerFieldTrialTest.java
    A slf4j-simple/src/test/java/org/slf4j/DetectLoggerNameMismatchTest.java
    R slf4j-simple/src/test/java/org/slf4j/ShapeTest.java
    R slf4j-simple/src/test/java/org/slf4j/shape/ShapeBase.java
    R slf4j-simple/src/test/java/org/slf4j/shape/Square.java

  Log Message:
  -----------
  Merge branch 'adorokhine-remarket'


Compare: https://github.com/qos-ch/slf4j/compare/7f7eeca50121...175c8e41b761
_______________________________________________
slf4j-dev mailing list
slf4j-dev@qos.ch
http://mailman.qos.ch/mailman/listinfo/slf4j-dev

Reply via email to