Re: [lang] changes.xml: add meaningful description for LANG-1200

2016-10-02 Thread Benedikt Ritter
Hello Pascal,

no I think I'll be able to resolve the conflicts when I merge the release
branch.

Thank you!


Re: [lang] changes.xml: add meaningful description for LANG-1200

2016-10-02 Thread Pascal Schumacher

Hi Benedikt,

sorry.

Shall I revert the changes?

-Pascal

Am 02.10.2016 um 18:47 schrieb Benedikt Ritter:

Hi Pascal,

please don't modify changes.xml for 3.5. I've already created 3.5 RC1 and
this will cause trouble when merging the release branch back to Master.

Thank you
Benedikt

<pascalschumac...@apache.org> schrieb am So. 2. Okt. 2016 um 18:23:


Repository: commons-lang
Updated Branches:
   refs/heads/master 756b91060 -> 496506ded


changes.xml: add meaningful description for LANG-1200


Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo
Commit:
http://git-wip-us.apache.org/repos/asf/commons-lang/commit/496506de
Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/496506de
Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/496506de

Branch: refs/heads/master
Commit: 496506dedda231ceaecb81d62bb611889ba38be9
Parents: 756b910
Author: pascalschumacher <pascalschumac...@gmx.net>
Authored: Sun Oct 2 18:23:42 2016 +0200
Committer: pascalschumacher <pascalschumac...@gmx.net>
Committed: Sun Oct 2 18:23:42 2016 +0200

--
  src/changes/changes.xml | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
--



http://git-wip-us.apache.org/repos/asf/commons-lang/blob/496506de/src/changes/changes.xml
--
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 5a124b4..5a6c5b7 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -155,7 +155,7 @@ The  type attribute can be
add,update,fix,remove.
  Fix parsing edge
cases in FastDateParser
  StringUtils#equals
fails with Index OOBE on non-Strings with identical leading prefix
  There are no tests
for CharSequenceUtils.regionMatches
-[GitHub PR] modify note at line 1230 #120
+StringUtils.ordinalIndexOf: Add missing right
parenthesis in JavaDoc example
  Incorrect Javadoc
StringUtils.containsAny(CharSequence, CharSequence...)
  Added new
property IS_OS_MAC_OSX_EL_CAPITAN in SystemUtils






-
To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org
For additional commands, e-mail: dev-h...@commons.apache.org



Re: [lang] changes.xml: add meaningful description for LANG-1200

2016-10-02 Thread Benedikt Ritter
Hi Pascal,

please don't modify changes.xml for 3.5. I've already created 3.5 RC1 and
this will cause trouble when merging the release branch back to Master.

Thank you
Benedikt

<pascalschumac...@apache.org> schrieb am So. 2. Okt. 2016 um 18:23:

> Repository: commons-lang
> Updated Branches:
>   refs/heads/master 756b91060 -> 496506ded
>
>
> changes.xml: add meaningful description for LANG-1200
>
>
> Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo
> Commit:
> http://git-wip-us.apache.org/repos/asf/commons-lang/commit/496506de
> Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/496506de
> Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/496506de
>
> Branch: refs/heads/master
> Commit: 496506dedda231ceaecb81d62bb611889ba38be9
> Parents: 756b910
> Author: pascalschumacher <pascalschumac...@gmx.net>
> Authored: Sun Oct 2 18:23:42 2016 +0200
> Committer: pascalschumacher <pascalschumac...@gmx.net>
> Committed: Sun Oct 2 18:23:42 2016 +0200
>
> --
>  src/changes/changes.xml | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> --
>
>
>
> http://git-wip-us.apache.org/repos/asf/commons-lang/blob/496506de/src/changes/changes.xml
> --
> diff --git a/src/changes/changes.xml b/src/changes/changes.xml
> index 5a124b4..5a6c5b7 100644
> --- a/src/changes/changes.xml
> +++ b/src/changes/changes.xml
> @@ -155,7 +155,7 @@ The  type attribute can be
> add,update,fix,remove.
>  Fix parsing edge
> cases in FastDateParser
>  StringUtils#equals
> fails with Index OOBE on non-Strings with identical leading prefix
>  There are no tests
> for CharSequenceUtils.regionMatches
> - due-to="BarkZhang">[GitHub PR] modify note at line 1230 #120
> + due-to="BarkZhang">StringUtils.ordinalIndexOf: Add missing right
> parenthesis in JavaDoc example
>  Incorrect Javadoc
> StringUtils.containsAny(CharSequence, CharSequence...)
>  Added new
> property IS_OS_MAC_OSX_EL_CAPITAN in SystemUtils
>
>
>