Repository: karaf
Updated Branches:
refs/heads/karaf-3.0.x a9b9e5497 -> fbdc3b376
[KARAF-2789] Upgrade to SSHD 0.10.1
Conflicts:
pom.xml
shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshAction.java
shell/ssh/src/main/java/org/apache/karaf/shell/ssh/UserAuthFactori
Repository: karaf
Updated Branches:
refs/heads/karaf-2.x 1b92d7c78 -> 994d3cce3
[KARAF-2789] Upgrade to SSHD 0.10.1
Conflicts:
client/src/main/java/org/apache/karaf/client/Main.java
pom.xml
shell/ssh/src/main/java/org/apache/karaf/shell/ssh/KnownHostsManager.java