Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 14 15:37:51 2011 @@ -1,3 +1,4 @@ +/archiva/branches/1.4-M2-RC/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java:1214301 /archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java:721945-723577 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java:686983-687034 /archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java:1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 14 15:37:51 2011 @@ -1,3 +1,4 @@ +/archiva/branches/1.4-M2-RC/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java:1214301 /archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java:721945-723577 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java:686983-687034 /archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java:1066068-1091313,1098897,1102210,1103608 Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 14 15:37:51 2011 @@ -1,3 +1,4 @@ +/archiva/branches/1.4-M2-RC/archiva-modules/plugins/repository-statistics/src/test:1214301 /archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test:721945-723577 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test:686983-687034 /archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/test:1066068-1091313,1098897,1102210,1103608 Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 14 15:37:51 2011 @@ -1,3 +1,4 @@ +/archiva/branches/1.4-M2-RC/archiva-modules/plugins/repository-statistics/src/test/java:1214301 /archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java:721945-723577 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java:686983-687034 /archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/test/java:1066068-1091313,1098897,1102210,1103608 Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 14 15:37:51 2011 @@ -1,3 +1,4 @@ +/archiva/branches/1.4-M2-RC/archiva-modules/plugins/repository-statistics/src/test/java/org:1214301 /archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org:721945-723577 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java/org:686983-687034 /archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/test/java/org:1066068-1091313,1098897,1102210,1103608 Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 14 15:37:51 2011 @@ -1,3 +1,4 @@ +/archiva/branches/1.4-M2-RC/archiva-modules/plugins/repository-statistics/src/test/java/org/apache:1214301 /archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache:721945-723577 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java/org/apache:686983-687034 /archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/test/java/org/apache:1066068-1091313,1098897,1102210,1103608 Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 14 15:37:51 2011 @@ -1,3 +1,4 @@ +/archiva/branches/1.4-M2-RC/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva:1214301 /archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva:721945-723577 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva:686983-687034 /archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva:1066068-1091313,1098897,1102210,1103608 Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 14 15:37:51 2011 @@ -1,3 +1,4 @@ +/archiva/branches/1.4-M2-RC/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata:1214301 /archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata:721945-723577 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata:686983-687034 /archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata:1066068-1091313,1098897,1102210,1103608 Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 14 15:37:51 2011 @@ -1,3 +1,4 @@ +/archiva/branches/1.4-M2-RC/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository:1214301 /archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository:721945-723577 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository:686983-687034 /archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository:1066068-1091313,1098897,1102210,1103608 Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 14 15:37:51 2011 @@ -1,3 +1,4 @@ +/archiva/branches/1.4-M2-RC/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats:1214301 /archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats:721945-723577 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats:686983-687034 /archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats:1066068-1091313,1098897,1102210,1103608 Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 14 15:37:51 2011 @@ -1,3 +1,4 @@ +/archiva/branches/1.4-M2-RC/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java:1214301 /archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java:721945-723577 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java:686983-687034 /archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java:1066068-1091313,1098897,1102210,1103608 Propchange: archiva/trunk/skin/src/main/resources/images/logos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 14 15:37:51 2011 @@ -1,2 +1,3 @@ +/archiva/branches/1.4-M2-RC/skin/src/main/resources/images/logos:1214301 /archiva/branches/archiva-1.3.x/skin/src/main/resources/images/logos:1066068-1091313,1098897,1102210,1103608 /archiva/trunk/skin/src/main/resources/images/logos:899478-909464,960322
