You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by al...@apache.org on 2014/10/17 14:45:18 UTC
svn commit: r1632559 - in /jackrabbit/oak/branches/1.0: ./
oak-tarmk-failover/ oak-tarmk-failover/osgi-conf/master/
oak-tarmk-failover/osgi-conf/slave/
Author: alexparvulescu
Date: Fri Oct 17 12:45:17 2014
New Revision: 1632559
URL: http://svn.apache.org/r1632559
Log:
OAK-2189 TarMK cold standby: update OSGi config example files
- merged revisions 1631699, 1631967
Added:
jackrabbit/oak/branches/1.0/oak-tarmk-failover/osgi-conf/master/org.apache.jackrabbit.oak.plugins.segment.failover.store.FailoverStoreService.config
- copied unchanged from r1631699, jackrabbit/oak/trunk/oak-tarmk-failover/osgi-conf/master/org.apache.jackrabbit.oak.plugins.segment.failover.store.FailoverStoreService.config
jackrabbit/oak/branches/1.0/oak-tarmk-failover/osgi-conf/slave/org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.config
- copied unchanged from r1631699, jackrabbit/oak/trunk/oak-tarmk-failover/osgi-conf/slave/org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.config
jackrabbit/oak/branches/1.0/oak-tarmk-failover/osgi-conf/slave/org.apache.jackrabbit.oak.plugins.segment.failover.store.FailoverStoreService.config
- copied unchanged from r1631699, jackrabbit/oak/trunk/oak-tarmk-failover/osgi-conf/slave/org.apache.jackrabbit.oak.plugins.segment.failover.store.FailoverStoreService.config
Removed:
jackrabbit/oak/branches/1.0/oak-tarmk-failover/osgi-conf/master/org.apache.jackrabbit.oak.plugins.segment.failover.store.FailoverStoreService.cfg
jackrabbit/oak/branches/1.0/oak-tarmk-failover/osgi-conf/slave/org.apache.jackrabbit.oak.plugins.segment.failover.store.FailoverStoreService.cfg
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-tarmk-failover/pom.xml
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1631699,1631967
Modified: jackrabbit/oak/branches/1.0/oak-tarmk-failover/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-tarmk-failover/pom.xml?rev=1632559&r1=1632558&r2=1632559&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-tarmk-failover/pom.xml (original)
+++ jackrabbit/oak/branches/1.0/oak-tarmk-failover/pom.xml Fri Oct 17 12:45:17 2014
@@ -102,8 +102,9 @@
<artifactId>apache-rat-plugin</artifactId>
<configuration>
<excludes>
- <exclude>osgi-conf/master/org.apache.jackrabbit.oak.plugins.segment.failover.store.FailoverStoreService.cfg</exclude>
- <exclude>osgi-conf/slave/org.apache.jackrabbit.oak.plugins.segment.failover.store.FailoverStoreService.cfg</exclude>
+ <exclude>osgi-conf/master/org.apache.jackrabbit.oak.plugins.segment.failover.store.FailoverStoreService.config</exclude>
+ <exclude>osgi-conf/slave/org.apache.jackrabbit.oak.plugins.segment.failover.store.FailoverStoreService.config</exclude>
+ <exclude>osgi-conf/slave/org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.config</exclude>
</excludes>
</configuration>
</plugin>