Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/camel
Merging in latest from upstream Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9b969680 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9b969680 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9b969680 Branch: refs/heads/master Commit: 9b9696808268cec710e001c1f7fd5fce34b3b3a2 Parents: 520e55f cdad658 Author: Scott England-Sullivan <sully6...@apache.org> Authored: Wed Oct 30 08:15:56 2013 -0500 Committer: Scott England-Sullivan <sully6...@apache.org> Committed: Wed Oct 30 08:15:56 2013 -0500 ---------------------------------------------------------------------- .../camel/component/aws/s3/S3Configuration.java | 10 ++++++ .../camel/component/aws/s3/S3Consumer.java | 38 ++++++++++++++------ .../camel/component/aws/s3/S3Endpoint.java | 9 ++++- .../component/aws/s3/AmazonS3ClientMock.java | 5 +-- .../camel/component/http4/HttpEndpoint.java | 9 +++++ .../camel/component/http4/HttpProducer.java | 7 ++++ .../component/http4/HttpAuthenticationTest.java | 12 +++++++ 7 files changed, 77 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
