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 ju...@apache.org on 2014/04/15 06:46:13 UTC
svn commit: r1587409 - in /jackrabbit/oak/branches/1.0: ./
oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java
Author: jukka
Date: Tue Apr 15 04:46:13 2014
New Revision: 1587409
URL: http://svn.apache.org/r1587409
Log:
1.0: Merged revision 1587408 (OAK-1719)
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1587408
Modified: jackrabbit/oak/branches/1.0/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java?rev=1587409&r1=1587408&r2=1587409&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java (original)
+++ jackrabbit/oak/branches/1.0/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java Tue Apr 15 04:46:13 2014
@@ -291,7 +291,7 @@ public class Main {
new RepositoryUpgrade(source, target);
upgrade.setCopyBinariesByReference(
options.has("datastore"));
- upgrade.copy();
+ upgrade.copy(null);
} finally {
target.dispose();
}
@@ -306,7 +306,7 @@ public class Main {
new RepositoryUpgrade(source, target);
upgrade.setCopyBinariesByReference(
options.has("datastore"));
- upgrade.copy();
+ upgrade.copy(null);
} finally {
store.close();
}