[GitHub] camel pull request #2000: merge from upstream

[jonmcewen <gi...@git.apache.org>]

GitHub user jonmcewen opened a pull request:

    https://github.com/apache/camel/pull/2000

    merge from upstream

    

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/jonmcewen/camel master

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/camel/pull/2000.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #2000
    
----
commit d22c6a327a998a2f58421ffd66eaa5cb25f32a88
Author: Jon McEwen <jo...@hotmail.com>
Date:   2015-10-15T08:20:47Z

    Merge pull request #1 from apache/master
    
    Update from apache/camel

commit 8496f9705c2906424f40deb10a9d1215c1371c61
Author: unknown <jo...@wdtbh00675.hq.pinstripe.co.uk>
Date:   2015-10-15T09:57:09Z

    Added test for multicast, but passes when I was expecting fail

commit d6d2f67c378ac8a57efff7475cf2fdbff665ed07
Author: jonmcewen <jo...@hotmail.com>
Date:   2015-10-15T13:35:49Z

    Correction to multicast route in unit test

commit ba03741eabf303cf3c9747d33c0501b0ba3ad440
Author: Jon McEwen <jo...@hotmail.com>
Date:   2015-10-15T13:57:16Z

    Merge pull request #2 from apache/master
    
    Fixed camel model json schema to include missing namespace aware lang…

commit 20d9cda1772e105c21382e6aa351fbac78b27990
Author: jonmcewen <jo...@hotmail.com>
Date:   2015-10-16T08:02:09Z

    spring-boot/graphite metrics example

commit 7d10dc4f4e06054833722980c287fb049826435a
Author: jonmcewen <jo...@hotmail.com>
Date:   2016-03-03T17:32:11Z

    update from apache

commit e68e77d9cb18684a91ac73d2287684b91804e377
Author: unknown <jo...@wdtbh00675.hq.pinstripe.co.uk>
Date:   2015-10-15T09:57:09Z

    Added test for multicast, but passes when I was expecting fail

commit 3d6d66a42e2835d6f04fef3a7aff7655ffabf501
Author: jonmcewen <jo...@hotmail.com>
Date:   2015-10-15T13:35:49Z

    Correction to multicast route in unit test

commit 6cd69eef2d58cbd9e780a1c9581a389373cdf6d7
Author: jonmcewen <jo...@hotmail.com>
Date:   2015-10-16T08:02:09Z

    spring-boot/graphite metrics example

commit 26902e78419fbc61b2964a19793bb44c35de3324
Author: jonmcewen <jo...@hotmail.com>
Date:   2016-03-04T09:49:29Z

    Merge branch 'master' of https://github.com/jonmcewen/camel

commit 45fd65dba17bd304b5a1b5b9fc8766b1b5b2caec
Author: Claus Ibsen <da...@apache.org>
Date:   2016-03-04T09:55:34Z

    CAMEL-9280: Allow passing custom headers to the proxy server in camel-smpp component. Thanks to Anshu Avinash for the patch.

commit a92d08c5ea9aeaa76c3a6f4e02bd6ba64d0d4b1d
Author: jonmcewen <jo...@hotmail.com>
Date:   2016-03-04T10:29:52Z

    remove differences with upstream

commit c315aec50f08fc4a6dfa086cab37ee1e2255e423
Author: jonmcewen <jo...@hotmail.com>
Date:   2016-03-07T10:00:11Z

    Merge remote-tracking branch 'upstream/master'

commit 06b33effeda5eb2bf22a7601ccf85d0aea5a381d
Author: Jon McEwen <jo...@hotmail.com>
Date:   2017-03-28T15:14:50Z

    Merge pull request #4 from apache/master
    
    Catch up merge

commit c846369dd9f117a1893a9b2193127b738613adac
Author: Jon McEwen <jo...@hotmail.com>
Date:   2017-08-02T08:09:47Z

    Merge pull request #5 from apache/master
    
    merge from apache/camel

----


---

[GitHub] camel pull request #2000: merge from upstream

[jonmcewen <gi...@git.apache.org>]

Github user jonmcewen closed the pull request at:

    https://github.com/apache/camel/pull/2000


---