You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by mi...@apache.org on 2016/04/08 14:03:57 UTC

[05/50] logging-log4j2 git commit: Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/b60bf6f1
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b60bf6f1
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b60bf6f1

Branch: refs/heads/LOG4J2-1356
Commit: b60bf6f139c0857728cec7c6311a0666ddb82982
Parents: 8e77520 b786b98
Author: rpopma <rp...@apache.org>
Authored: Thu Apr 7 02:51:14 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Thu Apr 7 02:51:14 2016 +0900

----------------------------------------------------------------------
 .../java/org/apache/logging/log4j/core/util/WatchManager.java  | 6 +++++-
 pom.xml                                                        | 2 +-
 src/changes/changes.xml                                        | 6 ++++++
 3 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------