From: Olivier Lamy <olamy@apache.org>
Date: Mon, 17 Oct 2011 20:00:36 +0000 (+0000)
Subject: note a merge repository ui action
X-Git-Tag: archiva-1.4-M1~14
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3d75cd0aa64baab98fd323d2833097a6a3f736f5;p=archiva.git

note a merge repository ui action

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1185346 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-docs/src/site/apt/release-notes.apt.vm b/archiva-docs/src/site/apt/release-notes.apt.vm
index 726c86567..82765eaae 100644
--- a/archiva-docs/src/site/apt/release-notes.apt.vm
+++ b/archiva-docs/src/site/apt/release-notes.apt.vm
@@ -55,6 +55,9 @@ Release Notes for Archiva ${project.version}
   * You can now download Maven index content from remote repositories to include
     artifacts which are not present locally in your search results.
 
+  * New UI action in repositories view to merge the staging repo to the managed
+    repository.
+
 * Compatibility Changes
 
   * If upgrading from earlier versions of Archiva, the list of libraries in