Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f105ac29 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f105ac29 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f105ac29 Branch: refs/heads/master Commit: f105ac29dc2fd97461d7a47873685e6cc0f3211e Parents: d193a86 5f72469 Author: Richard Kettelerij <r.kettele...@avisi.nl> Authored: Mon Mar 17 10:25:37 2014 +0100 Committer: Richard Kettelerij <r.kettele...@avisi.nl> Committed: Mon Mar 17 10:25:37 2014 +0100 ---------------------------------------------------------------------- .../camel/dataformat/avro/AvroDataFormat.java | 2 +- .../apache/camel/component/cxf/CxfConsumer.java | 2 +- components/camel-infinispan/pom.xml | 12 +- .../component/jsch/ScpServerTestSupport.java | 5 +- .../dataformat/protobuf/ProtobufDataFormat.java | 2 +- .../component/ssh/FileKeyPairProvider.java | 5 +- .../ssh/ResourceHelperKeyPairProvider.java | 4 +- parent/pom.xml | 6 +- .../src/main/resources/config.properties | 6 +- .../features/src/main/resources/features.xml | 2 + .../camel/itest/karaf/AbstractFeatureTest.java | 2 +- .../protobuf/generated/AddressBookProtos.java | 2172 ++++++++++++++---- .../itest/osgi/OSGiIntegrationTestSupport.java | 2 +- 13 files changed, 1730 insertions(+), 492 deletions(-) ----------------------------------------------------------------------
