You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/09/11 12:03:59 UTC
[17/17] camel git commit: Merge branch 'master' into boot2
Merge branch 'master' into boot2
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/dd9aa785
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dd9aa785
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dd9aa785
Branch: refs/heads/boot2
Commit: dd9aa78564eea80525689a6a498d3365ea6cce0f
Parents: 71b7f3b 5bb5014
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Sep 11 14:03:21 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Sep 11 14:03:21 2017 +0200
----------------------------------------------------------------------
.../src/main/docs/dropbox-component.adoc | 8 ++++-
.../twitter/search/TwitterSearchEndpoint.java | 4 ++-
parent/pom.xml | 6 ++--
.../features/src/main/resources/features.xml | 7 ++++
.../apache/camel/itest/karaf/CamelASN1Test.java | 34 ++++++++++++++++++++
5 files changed, 54 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/dd9aa785/parent/pom.xml
----------------------------------------------------------------------