You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2017/06/27 12:55:34 UTC
[2/2] camel git commit: Merge remote-tracking branch
'dmvolod/CAMEL-11456' into apache-master
Merge remote-tracking branch 'dmvolod/CAMEL-11456' into apache-master
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f0e4266f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f0e4266f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f0e4266f
Branch: refs/heads/master
Commit: f0e4266f2260c0cdcb1bb895461db22bbb502915
Parents: 010fef2 d20dda7
Author: Nicola Ferraro <ni...@gmail.com>
Authored: Tue Jun 27 14:54:57 2017 +0200
Committer: Nicola Ferraro <ni...@gmail.com>
Committed: Tue Jun 27 14:54:57 2017 +0200
----------------------------------------------------------------------
.../src/main/docs/grpc-component.adoc | 23 +++----
.../camel/component/grpc/GrpcComponent.java | 29 ++++----
.../camel/component/grpc/GrpcConfiguration.java | 71 +++++++-------------
.../camel/component/grpc/GrpcConsumer.java | 9 +--
.../camel/component/grpc/GrpcEndpoint.java | 24 ++++++-
.../camel/component/grpc/GrpcProducer.java | 11 ++-
.../apache/camel/component/grpc/GrpcUtils.java | 20 +++++-
.../grpc/GrpcConsumerAggregationTest.java | 4 +-
.../grpc/GrpcConsumerConcurrentTest.java | 4 +-
.../grpc/GrpcConsumerPropagationTest.java | 4 +-
.../component/grpc/GrpcProducerAsyncTest.java | 10 +--
.../grpc/GrpcProducerStreamingTest.java | 9 ++-
.../component/grpc/GrpcProducerSyncTest.java | 17 ++---
.../camel-grpc/src/test/proto/pingpong.proto | 2 +-
14 files changed, 115 insertions(+), 122 deletions(-)
----------------------------------------------------------------------