Repository: karaf Updated Branches: refs/heads/karaf-4.0.x b3fcae21a -> d6ddec814
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/d6ddec81 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/d6ddec81 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/d6ddec81 Branch: refs/heads/karaf-4.0.x Commit: d6ddec814b96025c155ad4aeb0aaa9d4056468e0 Parents: b3fcae2 Author: mhautman <[email protected]> Authored: Sun Mar 27 17:06:28 2016 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Thu Apr 14 17:13:27 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/d6ddec81/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";
