]> source.dussan.org Git - archiva.git/commit
projects / archiva.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 406f496) | patch
[MRM-1398],[MRM-1401],[MRM-1403]
authorMaria Odea B. Ching <oching@apache.org>
Sun, 8 Aug 2010 05:19:33 +0000 (05:19 +0000)
committerMaria Odea B. Ching <oching@apache.org>
Sun, 8 Aug 2010 05:19:33 +0000 (05:19 +0000)
commit93cd044c22708ac18587a24bf601fc8c5b762385
treeb87f1c69ce1687ddc5a7b799b1c7d15141811e84tree | snapshot
parent406f496d260dfaddd28610df0c630cfe576e7087commit | diff
[MRM-1398],[MRM-1401],[MRM-1403]
submitted by Patti Arachchige Eshan Sudharaka
o fixed repositories page
o do not merge snapshot artifacts
o fixed problem when merging artifacts with classifier

git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-980@983343 13f79535-47bb-0310-9956-ffa450edef68
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/MergeAction.java diff | blob | history
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/mergeExcludeConflicts.jsp diff | blob | history
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp diff | blob | history
archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java diff | blob | history
Apache Archiva Repository: https://github.com/apache/archiva