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/04/14 17:13:07 UTC
[1/2] karaf git commit: KARAF-4454 - Resolve scr:list conflict
between gogo and Karaf
Repository: karaf
Updated Branches:
refs/heads/master 6657400bd -> 6b9846657
KARAF-4454 - Resolve scr:list conflict between gogo and Karaf
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/fd2b1c3d
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/fd2b1c3d
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/fd2b1c3d
Branch: refs/heads/master
Commit: fd2b1c3da4658da500d54d10ab8ca921e2d9d7a1
Parents: 41fc57f
Author: mhautman <mo...@gmail.com>
Authored: Sun Mar 27 17:06:28 2016 +0200
Committer: mhautman <mo...@gmail.com>
Committed: Sat Apr 2 14:12:57 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/karaf/scr/command/ScrCommandConstants.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/fd2b1c3d/scr/command/src/main/java/org/apache/karaf/scr/command/ScrCommandConstants.java
----------------------------------------------------------------------
diff --git a/scr/command/src/main/java/org/apache/karaf/scr/command/ScrCommandConstants.java b/scr/command/src/main/java/org/apache/karaf/scr/command/ScrCommandConstants.java
index 9faf449..2ca8506 100644
--- a/scr/command/src/main/java/org/apache/karaf/scr/command/ScrCommandConstants.java
+++ b/scr/command/src/main/java/org/apache/karaf/scr/command/ScrCommandConstants.java
@@ -22,7 +22,7 @@ public class ScrCommandConstants {
public static final String SCR_COMMAND = "scr";
- public static final String LIST_FUNCTION = "list";
+ public static final String LIST_FUNCTION = "components";
public static final String ACTIVATE_FUNCTION = "activate";
[2/2] karaf git commit: Merge branch 'master' of
https://github.com/mhautman/karaf
Posted by jb...@apache.org.
Merge branch 'master' of https://github.com/mhautman/karaf
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/6b984665
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/6b984665
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/6b984665
Branch: refs/heads/master
Commit: 6b9846657f92ee4bac5bd843ffdfd4d5672a2689
Parents: 6657400 fd2b1c3
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Thu Apr 14 16:51:47 2016 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Thu Apr 14 16:51:47 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/karaf/scr/command/ScrCommandConstants.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------