camel-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Claus Ibsen <claus.ib...@gmail.com>
Subject Re: SMPP changes: ordering the pull requests
Date Wed, 03 Dec 2014 18:44:32 GMT
On Wed, Dec 3, 2014 at 3:43 PM, Daniel Pocock <daniel@pocock.pro> wrote:
>
>
> I suggest merging in the following order.  As each one is merged, I'll
> update the next one to merge cleanly with master.  Please email me or
> comment in Github when each of them is accepted.
>
>
> https://github.com/apache/camel/pull/321
>      https://issues.apache.org/jira/browse/CAMEL-8008
>    (should not cause merge conflicts for the next change)
>

pull 321 = done


> https://github.com/apache/camel/pull/340
>      https://issues.apache.org/jira/browse/CAMEL-8116
>

pull 340 = done

> https://github.com/apache/camel/pull/323
>      https://issues.apache.org/jira/browse/CAMEL-8117
>

pull 323 = merge conflict. Please update the PR

> Not yet ready to be merged:
>
> https://github.com/apache/camel/pull/317
>     https://issues.apache.org/jira/browse/CAMEL-8002
>      - waiting for jsmpp to accept my pull request too
>      - will need some tweaks after merging the other pull requests



-- 
Claus Ibsen
-----------------
Red Hat, Inc.
Email: cibsen@redhat.com
Twitter: davsclaus
Blog: http://davsclaus.com
Author of Camel in Action: http://www.manning.com/ibsen
hawtio: http://hawt.io/
fabric8: http://fabric8.io/

Mime
View raw message