[karaf] branch master updated (00e52be -> 0a6a5ae)

[jb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git.


    from 00e52be  Merge pull request #449 from jbonofre/KARAF-5605
     add 080cb83  [KARAF-5473] Add heartbeat by default in Karaf ssh client
     new 0a6a5ae  Merge pull request #440 from jbonofre/KARAF-5473

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 assemblies/features/standard/src/main/feature/feature.xml   |  1 -
 client/src/main/java/org/apache/karaf/client/Main.java      | 13 ++++++++++---
 .../apache/karaf/shell/impl/console/ConsoleSessionImpl.java |  4 +++-
 3 files changed, 13 insertions(+), 5 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
jbonofre@apache.org.

[karaf] 01/01: Merge pull request #440 from jbonofre/KARAF-5473

[jb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git

commit 0a6a5ae3015b18d18e418255181c480c9d0fd35b
Merge: 00e52be 080cb83
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Sun Feb 11 19:08:57 2018 +0100

    Merge pull request #440 from jbonofre/KARAF-5473
    
    [KARAF-5473] Add heartbeat by default in Karaf ssh client

 assemblies/features/standard/src/main/feature/feature.xml   |  1 -
 client/src/main/java/org/apache/karaf/client/Main.java      | 13 ++++++++++---
 .../apache/karaf/shell/impl/console/ConsoleSessionImpl.java |  4 +++-
 3 files changed, 13 insertions(+), 5 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
jbonofre@apache.org.