Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2
Conflicts:
src/changes/changes.xml
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/cc2b074b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/cc2b074b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/cc2b074b
Branch: refs/heads/LOG4J2-435-delete-on-rollover
Commit: cc2b074b13f1f6a9f7dcaf582d22ebf9b92ed3e3
Parents: 224a9ec a212f6b
Author: Ralph Goers <[email protected]>
Authored: Fri Nov 20 21:37:02 2015 -0700
Committer: Ralph Goers <[email protected]>
Committed: Fri Nov 20 21:37:02 2015 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------
