diff options
| author | Olivier Lamy <olamy@apache.org> | 2012-09-24 08:45:49 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2012-09-24 08:45:49 +0000 |
| commit | 0d2eed326e0c15764482a4524bc45a77a89552ff (patch) | |
| tree | cbb6ab993e2386a40c06930568bba67ef7145a46 /archiva-modules/archiva-base | |
| parent | af25183857e85748212ddc711129910249ce003d (diff) | |
| download | archiva-0d2eed326e0c15764482a4524bc45a77a89552ff.tar.gz archiva-0d2eed326e0c15764482a4524bc45a77a89552ff.zip | |
merge repositories rest service: users must have karma for this operation
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1389245 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-base')
| -rw-r--r-- | archiva-modules/archiva-base/archiva-security-common/src/main/java/org/apache/archiva/security/common/ArchivaRoleConstants.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/archiva-modules/archiva-base/archiva-security-common/src/main/java/org/apache/archiva/security/common/ArchivaRoleConstants.java b/archiva-modules/archiva-base/archiva-security-common/src/main/java/org/apache/archiva/security/common/ArchivaRoleConstants.java index 334bb8d27..814fc3bbd 100644 --- a/archiva-modules/archiva-base/archiva-security-common/src/main/java/org/apache/archiva/security/common/ArchivaRoleConstants.java +++ b/archiva-modules/archiva-base/archiva-security-common/src/main/java/org/apache/archiva/security/common/ArchivaRoleConstants.java @@ -65,6 +65,8 @@ public class ArchivaRoleConstants public static final String OPERATION_REPOSITORY_UPLOAD = "archiva-upload-repository"; public static final String OPERATION_REPOSITORY_DELETE = "archiva-delete-artifact"; + + public static final String OPERATION_MERGE_REPOSITORY = "archiva-merge-repository"; public static final String OPERATION_VIEW_AUDIT_LOG = "archiva-view-audit-logs"; |