commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Benedikt Ritter <brit...@apache.org>
Subject Re: [2/2] [lang] Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/commons-lang.git
Date Fri, 29 Jul 2016 07:33:18 GMT
Hi Gary,

<ggregory@apache.org> schrieb am Fr., 29. Juli 2016 um 07:43 Uhr:

> Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/commons-lang.git
>
> Conflicts:
>         src/changes/changes.xml
>
>
> Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo
> Commit:
> http://git-wip-us.apache.org/repos/asf/commons-lang/commit/69732963
> Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/69732963
> Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/69732963
>
> Branch: refs/heads/master
> Commit: 697329630f16ee37cab30004aab5b0831fc9ecc3
> Parents: 3899cc6 bd9adbb
> Author: Gary Gregory <ggregory@apache.org>
> Authored: Thu Jul 28 22:43:48 2016 -0700
> Committer: Gary Gregory <ggregory@apache.org>
> Committed: Thu Jul 28 22:43:48 2016 -0700
>
> ----------------------------------------------------------------------
>  src/changes/changes.xml                         |  1 -
>  .../commons/lang3/time/FastDatePrinter.java     | 75 ++++++++++++++++----
>  2 files changed, 60 insertions(+), 16 deletions(-)
> ----------------------------------------------------------------------
>
>
>
> http://git-wip-us.apache.org/repos/asf/commons-lang/blob/69732963/src/changes/changes.xml
> ----------------------------------------------------------------------
> diff --cc src/changes/changes.xml
> index 025ba34,96487a2..8887572
> --- a/src/changes/changes.xml
> +++ b/src/changes/changes.xml
> @@@ -46,8 -46,8 +46,7 @@@ The <action> type attribute can be add,
>     <body>
>
>     <release version="3.5" date="tba" description="tba">
> -     <action issue="LANG-1253" type="add" dev="ggregory"
> due-to="adilek">[GitHub issue #170] Add RandomUtils#nextBoolean()
> method</action>
>  -    <action issue="LANG-1248" type="fix" dev="chas" due-to="Benoit
> Wiart">FastDatePrinter Memory allocation regression</action>
>  -    <action issue="LANG-1247" type="fix" dev="chas" due-to="Benoit
> Wiart">FastDatePrinter generates extra Date objects</action>
>

Why have this entires been dropped from changes.xml?

Benedikt


>  +    <action issue="LANG-1247" type="update" dev="chas" due-to="Benoit
> Wiart">FastDatePrinter generates extra Date objects</action>
>       <action issue="LANG-1018" type="fix" dev="pschumacher" due-to="Nick
> Manley">Fix precision loss on NumberUtils.createNumber(String)</action>
>       <action issue="LANG-1229" type="update" dev="pschumacher"
> due-to="Ruslan Cheremin">HashCodeBuilder.append(Object,Object) is too big
> to be inlined, which prevents whole builder to be scalarized</action>
>       <action issue="LANG-1085" type="add" dev="oheger" due-to="oheger /
> kinow">Add a circuit breaker implementation</action>
>
>

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message