This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8e4ee23763cd40ab174cd23c1c0aded8ca8ed35a
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Thu Jun 27 17:16:52 2019 +0100
CAMEL-13692 - More doc fixes
---
components/camel-ssh/src/main/docs/ssh-component.adoc | 3 ++-
docs/components/modules/ROOT/pages/ssh-component.adoc | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/components/camel-ssh/src/main/docs/ssh-component.adoc
b/components/camel-ssh/src/main/docs/ssh-component.adoc
index 8ff789d..f2eb0ae 100644
--- a/components/camel-ssh/src/main/docs/ssh-component.adoc
+++ b/components/camel-ssh/src/main/docs/ssh-component.adoc
@@ -136,7 +136,8 @@ The component supports 30 options, which are listed below.
| *camel.component.ssh.configuration.fail-on-unknown-host* | Specifies whether
a connection to an unknown host should fail or not. This value is only checked
when the property knownHosts is set. | false | Boolean
| *camel.component.ssh.configuration.host* | Sets the hostname of the remote
SSH server. | | String
| *camel.component.ssh.configuration.key-pair-provider* | Sets the
KeyPairProvider reference to use when connecting using Certificates to the
remote SSH Server. | | KeyPairProvider
-| *camel.component.ssh.configuration.key-type* | Sets the key type to pass to
the KeyPairProvider as part of authentication. KeyPairProvider.loadKey(...)
will be passed this value. Defaults to ssh-rsa. | ssh-rsa | String
+| *camel.component.ssh.configuration.key-type* | Sets the key type to pass to
the KeyPairProvider as part of authentication. KeyPairProvider.loadKey(...)
will be passed this value. From Camel 3.0.0 / 2.25.0, by default Camel will
select the first available KeyPair that is loaded. Prior to this, a KeyType of
'ssh-rsa' was enforced by default. | | String
+>>>>> 5a0d6d7f287... CAMEL-13692 - More doc fixes
| *camel.component.ssh.configuration.known-hosts-resource* | Sets the resource
path for a known_hosts file | | String
| *camel.component.ssh.configuration.password* | Sets the password to use in
connecting to remote SSH server. Requires keyPairProvider to be set to null. |
| String
| *camel.component.ssh.configuration.poll-command* | Sets the command string
to send to the remote SSH server during every poll cycle. Only works with
camel-ssh component being used as a consumer, i.e. from(ssh://...) You may need
to end your command with a newline, and that must be URL encoded %0A | | String
diff --git a/docs/components/modules/ROOT/pages/ssh-component.adoc
b/docs/components/modules/ROOT/pages/ssh-component.adoc
index 3215588..3b961f8 100644
--- a/docs/components/modules/ROOT/pages/ssh-component.adoc
+++ b/docs/components/modules/ROOT/pages/ssh-component.adoc
@@ -115,7 +115,7 @@ with the following path and query parameters:
| *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used.
See ScheduledExecutorService in JDK for details. | true | boolean
| *certResource* (security) | Sets the resource path of the certificate to use
for Authentication. Will use ResourceHelperKeyPairProvider to resolve file
based certificate, and depends on keyType setting. | | String
| *keyPairProvider* (security) | Sets the KeyPairProvider reference to use
when connecting using Certificates to the remote SSH Server. | |
KeyPairProvider
-| *keyType* (security) | Sets the key type to pass to the KeyPairProvider as
part of authentication. KeyPairProvider.loadKey(...) will be passed this value.
Defaults to ssh-rsa. | | String
+| *keyType* (security) | Sets the key type to pass to the KeyPairProvider as
part of authentication. KeyPairProvider.loadKey(...) will be passed this value.
From Camel 3.0.0 / 2.25.0, by default Camel will select the first available
KeyPair that is loaded. Prior to this, a KeyType of 'ssh-rsa' was enforced by
default. | | String
| *password* (security) | Sets the password to use in connecting to remote SSH
server. Requires keyPairProvider to be set to null. | | String
| *username* (security) | Sets the username to use in logging into the remote
SSH server. | | String
|===
@@ -151,7 +151,7 @@ The component supports 30 options, which are listed below.
| *camel.component.ssh.configuration.fail-on-unknown-host* | Specifies whether
a connection to an unknown host should fail or not. This value is only checked
when the property knownHosts is set. | false | Boolean
| *camel.component.ssh.configuration.host* | Sets the hostname of the remote
SSH server. | | String
| *camel.component.ssh.configuration.key-pair-provider* | Sets the
KeyPairProvider reference to use when connecting using Certificates to the
remote SSH Server. | | KeyPairProvider
-| *camel.component.ssh.configuration.key-type* | Sets the key type to pass to
the KeyPairProvider as part of authentication. KeyPairProvider.loadKey(...)
will be passed this value. Defaults to "ssh-rsa". | ssh-rsa | String
+| *camel.component.ssh.configuration.key-type* | Sets the key type to pass to
the KeyPairProvider as part of authentication. KeyPairProvider.loadKey(...)
will be passed this value. From Camel 3.0.0 / 2.25.0, by default Camel will
select the first available KeyPair that is loaded. Prior to this, a KeyType of
'ssh-rsa' was enforced by default. | | String
| *camel.component.ssh.configuration.known-hosts-resource* | Sets the resource
path for a known_hosts file | | String
| *camel.component.ssh.configuration.password* | Sets the password to use in
connecting to remote SSH server. Requires keyPairProvider to be set to null. |
| String
| *camel.component.ssh.configuration.poll-command* | Sets the command string
to send to the remote SSH server during every poll cycle. Only works with
camel-ssh component being used as a consumer, i.e. from("ssh://...") You may
need to end your command with a newline, and that must be URL encoded %0A | |
String
