Merge branch 'CAMEL-7605' of https://github.com/kevinearls/camel
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/93bc28d7 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/93bc28d7 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/93bc28d7 Branch: refs/heads/master Commit: 93bc28d7a0c346098709ba621cb195770d277325 Parents: 0b5def5 778c848 Author: Claus Ibsen <[email protected]> Authored: Sun Jul 20 10:21:25 2014 +0200 Committer: Claus Ibsen <[email protected]> Committed: Sun Jul 20 10:21:25 2014 +0200 ---------------------------------------------------------------------- .../elasticsearch/ElasticsearchComponent.java | 7 ++- .../ElasticsearchConfiguration.java | 14 +++++ .../elasticsearch/ElasticsearchEndpoint.java | 30 +++++----- ...ponentConfigurationAndDocumentationTest.java | 58 ++++++++++++++++++++ 4 files changed, 93 insertions(+), 16 deletions(-) ----------------------------------------------------------------------
