You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by oh...@apache.org on 2015/06/24 22:25:05 UTC
[3/3] [lang] Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/commons-lang
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/commons-lang
Conflicts:
src/changes/changes.xml
src/main/java/org/apache/commons/lang3/text/StrLookup.java
Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/80644cda
Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/80644cda
Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/80644cda
Branch: refs/heads/master
Commit: 80644cdab9a77db0a52d09d9ebb1f406912997d1
Parents: 305d5eb 04b55bc
Author: oheger <ol...@oliver-heger.de>
Authored: Wed Jun 24 22:23:17 2015 +0200
Committer: oheger <ol...@oliver-heger.de>
Committed: Wed Jun 24 22:23:17 2015 +0200
----------------------------------------------------------------------
src/changes/changes.xml | 2 +
.../org/apache/commons/lang3/EnumUtils.java | 8 +--
.../org/apache/commons/lang3/StringUtils.java | 9 +--
.../apache/commons/lang3/text/WordUtils.java | 20 +++---
.../org/apache/commons/lang3/EnumUtilsTest.java | 51 ++++++++++++++
.../apache/commons/lang3/StringUtilsTest.java | 71 +++++++++++++-------
.../commons/lang3/text/WordUtilsTest.java | 9 ++-
.../FastDateParser_TimeZoneStrategyTest.java | 9 ++-
8 files changed, 129 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/80644cda/src/changes/changes.xml
----------------------------------------------------------------------
diff --cc src/changes/changes.xml
index d6b89bb,5f54262..9d961cc
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@@ -22,7 -22,8 +22,9 @@@
<body>
<release version="3.5" date="tba" description="tba">
+ <action issue="LANG-1141" type="fix" dev="oheger">StrLookup.systemPropertiesLookup() no longer reacts on changes on system properties</action>
+ <action issue="LANG-1147" type="fix" dev="sebb" due-to="Loic Guibert">EnumUtils *BitVector issue with more than 32 values Enum</action>
+ <action issue="LANG-1059" type="fix" dev="sebb" due-to="Colin Casey">Capitalize javadoc is incorrect</action>
<action issue="LANG-1137" type="add" dev="britter" due-to="Matthew Aguirre">Add check for duplicate event listener in EventListenerSupport</action>
<action issue="LANG-1133" type="bug" dev="chas" due-to="Pascal Schumacher">FastDateParser_TimeZoneStrategyTest#testTimeZoneStrategyPattern fails on Windows with German Locale</action>
<action issue="LANG-1135" type="add" dev="britter" due-to="Eduardo Martins">Add method containsAllWords to WordUtils</action>