Merge branch 'master' into release_scripts
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/4f8b92ca Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/4f8b92ca Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/4f8b92ca Branch: refs/heads/release_scripts Commit: 4f8b92ca554907f508dbc3aee02795a32701c0f0 Parents: 289575c 327c950 Author: Thorsten Schöning <[email protected]> Authored: Sat Jan 27 13:01:13 2018 +0100 Committer: Thorsten Schöning <[email protected]> Committed: Sat Jan 27 13:01:13 2018 +0100 ---------------------------------------------------------------------- src/changes/changes.xml | 1 + .../log4cxx/helpers/relativetimedateformat.h | 2 +- src/main/include/log4cxx/spi/loggingevent.h | 19 ++++++++-------- src/site/apt/building/ant.apt | 12 +++++----- src/site/apt/building/autotools.apt | 2 +- src/site/apt/building/maven.apt | 6 ++--- src/site/apt/building/vstudio.apt | 2 +- src/site/apt/building/xcode.apt | 2 +- src/site/apt/community/issue-tracking.apt | 6 ++--- src/site/apt/download.apt.vm | 16 ++++++------- src/site/apt/index.apt | 8 +++---- src/site/resources/.htaccess | 24 ++++++++++---------- src/site/site.vm | 8 +++---- src/site/site.xml | 14 ++++++------ 14 files changed, 62 insertions(+), 60 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/4f8b92ca/src/changes/changes.xml ---------------------------------------------------------------------- diff --cc src/changes/changes.xml index c30826d,fbec857..249e96f --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@@ -23,14 -23,10 +23,15 @@@ </properties> <body> - <release version="0.11.0" + <release version="0.11.1" date="XXXX-XX-XX" description="Maintenance release"> + </release> + + <release version="0.11.0" + date="2017-08-17" + description="Maintenance release"> + <action issue="LOGCXX-493" type="fix">Wrong usage of milli- vs. micro- and non- vs. milliseconds in some docs.</action> <action issue="LOGCXX-488" type="fix">Space after log level hides messages</action> <action issue="LOGCXX-484" type="fix">Spelling error s/excute/execute</action> <action issue="LOGCXX-482" type="fix">Build failure with GCC-6</action>
