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 2019/08/26 05:44:33 UTC

[karaf] branch master updated: Remove feature:update ACL

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


The following commit(s) were added to refs/heads/master by this push:
     new d0beeaa  Remove feature:update ACL
     new ef72761  Merge pull request #914 from coheigea/update
d0beeaa is described below

commit d0beeaa5841892a0c5015c04d67e62459e1285fa
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Aug 22 16:01:33 2019 +0100

    Remove feature:update ACL
---
 assemblies/features/standard/src/main/feature/feature.xml                | 1 -
 .../instance/resources/etc/org.apache.karaf.command.acl.feature.cfg      | 1 -
 itests/test/src/test/filtered-resources/etc/feature.xml                  | 1 -
 3 files changed, 3 deletions(-)

diff --git a/assemblies/features/standard/src/main/feature/feature.xml b/assemblies/features/standard/src/main/feature/feature.xml
index 0dd524d..666c660 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -150,7 +150,6 @@ install = admin
 uninstall = admin
 start = admin
 stop = admin
-update = admin
             </config>
             <bundle start-level="30">mvn:org.apache.karaf.features/org.apache.karaf.features.command/${project.version}</bundle>
         </conditional>
diff --git a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.command.acl.feature.cfg b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.command.acl.feature.cfg
index 8cea100..823fe3e 100644
--- a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.command.acl.feature.cfg
+++ b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/org.apache.karaf.command.acl.feature.cfg
@@ -24,4 +24,3 @@ install = admin
 uninstall = admin
 start = admin
 stop = admin
-update = admin
\ No newline at end of file
diff --git a/itests/test/src/test/filtered-resources/etc/feature.xml b/itests/test/src/test/filtered-resources/etc/feature.xml
index 916a782..43fca20 100644
--- a/itests/test/src/test/filtered-resources/etc/feature.xml
+++ b/itests/test/src/test/filtered-resources/etc/feature.xml
@@ -111,7 +111,6 @@
                 uninstall = admin
                 start = admin
                 stop = admin
-                update = admin
             </config>
             <bundle start-level="30">mvn:org.apache.karaf.features/org.apache.karaf.features.command/${project.version}</bundle>
         </conditional>