]> source.dussan.org Git - archiva.git/commit
[MRM-1397] reflect in the staging repo changes made in the configuration of the manag...
authorMaria Odea B. Ching <oching@apache.org>
Sun, 1 Aug 2010 03:04:06 +0000 (03:04 +0000)
committerMaria Odea B. Ching <oching@apache.org>
Sun, 1 Aug 2010 03:04:06 +0000 (03:04 +0000)
commit1014b00be4064973f807ae252734ea29e894417e
tree4d60777f259b90b741752ba28717c30080fd0c79
parentfde7697e4d564c18dd99f1c67eca4e7326766055
[MRM-1397] reflect in the staging repo changes made in the configuration of the managed repo it is attached to
submitted by Patti Arachchige Eshan Sudharaka

git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-980@981121 13f79535-47bb-0310-9956-ffa450edef68
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/MergeAction.java
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryAction.java
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryAction.java
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRepository.jsp
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/mergeExcludeConflicts.jsp
archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java
archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java