You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2016/02/17 14:48:27 UTC
[1/2] karaf git commit: handle getDescription() fallback consistently
Repository: karaf
Updated Branches:
refs/heads/master cd2996665 -> 2038a4bf0
handle getDescription() fallback consistently
Signed-off-by: Markus Rathgeb <ma...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/ccbbfd43
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/ccbbfd43
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/ccbbfd43
Branch: refs/heads/master
Commit: ccbbfd43292b230c001c3118cc4db3eae3ef4ed8
Parents: 2a5725e
Author: Markus Rathgeb <ma...@gmail.com>
Authored: Wed Feb 10 22:58:04 2016 +0100
Committer: Markus Rathgeb <ma...@gmail.com>
Committed: Wed Feb 10 22:58:04 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/karaf/shell/compat/CommandTracker.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/ccbbfd43/shell/console/src/main/java/org/apache/karaf/shell/compat/CommandTracker.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/compat/CommandTracker.java b/shell/console/src/main/java/org/apache/karaf/shell/compat/CommandTracker.java
index 0e5c2e6..072857f 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/compat/CommandTracker.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/compat/CommandTracker.java
@@ -190,7 +190,7 @@ public class CommandTracker implements ServiceTrackerCustomizer<Object, Object>
if (property != null) {
return property.toString();
} else {
- return null;
+ return getName();
}
}
[2/2] karaf git commit: Merge branch 'karaf-4270-fallback-k41' of
https://github.com/maggu2810/karaf
Posted by jb...@apache.org.
Merge branch 'karaf-4270-fallback-k41' of https://github.com/maggu2810/karaf
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/2038a4bf
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/2038a4bf
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/2038a4bf
Branch: refs/heads/master
Commit: 2038a4bf049b1002acb58054d3126cc29024bebc
Parents: cd29966 ccbbfd4
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Feb 17 13:58:02 2016 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Feb 17 13:58:02 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/karaf/shell/compat/CommandTracker.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------