Merge branch '124-branch' Conflicts: src/changes/changes.xml
LANG-1208: StrSubstitutor can preserve escapes This closes #124 from github. Thanks to Samuel Karp. Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/59c28bb2 Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/59c28bb2 Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/59c28bb2 Branch: refs/heads/master Commit: 59c28bb25fff0fc667d1319b13a3358bd44e81d5 Parents: 242e1f5 8e17410 Author: Hen <h...@flamefew.com> Authored: Thu Feb 25 21:17:53 2016 -0800 Committer: Hen <h...@flamefew.com> Committed: Thu Feb 25 21:17:53 2016 -0800 ---------------------------------------------------------------------- src/changes/changes.xml | 1 + .../commons/lang3/text/StrSubstitutor.java | 33 ++++++++++++++++++++ .../commons/lang3/text/StrSubstitutorTest.java | 15 +++++++++ 3 files changed, 49 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-lang/blob/59c28bb2/src/changes/changes.xml ---------------------------------------------------------------------- diff --cc src/changes/changes.xml index c981921,c1d017e..29d704d --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@@ -22,7 -22,7 +22,8 @@@ <body> <release version="3.5" date="tba" description="tba"> + <action issue="LANG-1208" type="update" dev="bayard" due-to="Samuel Karp">StrSubstitutor can preserve escapes</action> + <action issue="LANG-1175" type="fix" dev="wikier" due-to="Benedikt Ritter">Remove Ant-based build</action> <action issue="LANG-1192" type="add" dev="chas" due-to="Dominik Stadler">FastDateFormat support of the week-year component (uppercase 'Y')</action> <action issue="LANG-1194" type="fix" dev="chas">Limit max heap memory for consistent Travis CI build</action> <action issue="LANG-1186" type="fix" dev="chas" due-to="NickManley">Fix NullPointerException in FastDateParser$TimeZoneStrategy</action>