You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2008/11/14 14:57:01 UTC
svn commit: r714006 - in /jackrabbit/branches/1.5: ./
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/AccessControlPolicyIteratorAdapter.java
jackrabbit-ocm-nodemanagement/src/test/resources/log4j.properties
Author: jukka
Date: Fri Nov 14 05:57:01 2008
New Revision: 714006
URL: http://svn.apache.org/viewvc?rev=714006&view=rev
Log:
1.5: Record previously merged revision 709211
Modified:
jackrabbit/branches/1.5/ (props changed)
jackrabbit/branches/1.5/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/AccessControlPolicyIteratorAdapter.java (props changed)
jackrabbit/branches/1.5/jackrabbit-ocm-nodemanagement/src/test/resources/log4j.properties (props changed)
Propchange: jackrabbit/branches/1.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 14 05:57:01 2008
@@ -1,2 +1,2 @@
/jackrabbit/branches/1.3:631261
-/jackrabbit/trunk:703899-704158,704165,704167,704324,704358,704361,704864,704933,704939,705010,705033,705243,705496,705522,705579,705925,705932,705934,705937-705938,705961,706242,706273,706285-706286,706562,706606,706649,706655,706660,706697,706918,707303-707304,707307,707310,707630,708206,708598,708609,708613,708619,708634,708840,708863,708909,708929,708943,709115,709142,709207
+/jackrabbit/trunk:703899-704158,704165,704167,704324,704358,704361,704864,704933,704939,705010,705033,705243,705496,705522,705579,705925,705932,705934,705937-705938,705961,706242,706273,706285-706286,706562,706606,706649,706655,706660,706697,706918,707303-707304,707307,707310,707630,708206,708598,708609,708613,708619,708634,708840,708863,708909,708929,708943,709115,709142,709207,709211
Propchange: jackrabbit/branches/1.5/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/AccessControlPolicyIteratorAdapter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 14 05:57:01 2008
@@ -1,2 +1,2 @@
/jackrabbit/branches/1.3/jackrabbit-core/src/main/java/org/apache/jackrabbit/commons/iterator/AccessControlPolicyIteratorAdapter.java:631261
-/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/AccessControlPolicyIteratorAdapter.java:705938,705961,706242,706273,708634,708840,708863,708909,708929,708943,709115,709142
+/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/AccessControlPolicyIteratorAdapter.java:705938,705961,706242,706273,708634,708840,708863,708909,708929,708943,709115,709142,709211
Propchange: jackrabbit/branches/1.5/jackrabbit-ocm-nodemanagement/src/test/resources/log4j.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 14 05:57:01 2008
@@ -1,2 +1,2 @@
/jackrabbit/branches/1.3/jackrabbit-ocm-nodemanagement/src/test/log4j.properties:631261
-/jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/test/resources/log4j.properties:708840,708863,708909,708929,708943,709115,709142
+/jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/test/resources/log4j.properties:708840,708863,708909,708929,708943,709115,709142,709211