You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jm...@apache.org on 2015/08/12 18:22:24 UTC
[1/2] cassandra git commit: Remove incorrect file separator in
CommitLogArchiver on Windows
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 0be8cb665 -> a186ac6ee
Remove incorrect file separator in CommitLogArchiver on Windows
Patch by jmckenzie; reviewed by pmotta for CASSANDRA-9897
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5c88651a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5c88651a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5c88651a
Branch: refs/heads/cassandra-3.0
Commit: 5c88651a41c55b2ee2c3b387e92b1864386df46c
Parents: fec40fd
Author: Joshua McKenzie <jm...@apache.org>
Authored: Wed Aug 12 12:20:57 2015 -0400
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Wed Aug 12 12:20:57 2015 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c88651a/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
index 02072de..c25a740 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
@@ -124,6 +124,9 @@ public class CommitLogArchiver
{
segment.waitForFinalSync();
String command = archiveCommand.replace("%name", segment.getName());
+ // We need to swap out / with the os-specific separator in the event someone provided an incorrect value
+ if (FBUtilities.isWindows())
+ archiveCommand.replace('/', File.separatorChar);
command = command.replace("%path", segment.getPath());
exec(command);
}
[2/2] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by jm...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a186ac6e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a186ac6e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a186ac6e
Branch: refs/heads/cassandra-3.0
Commit: a186ac6eebf6a58621abc1a97906730b1c411687
Parents: 0be8cb6 5c88651
Author: Joshua McKenzie <jm...@apache.org>
Authored: Wed Aug 12 12:21:32 2015 -0400
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Wed Aug 12 12:21:32 2015 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a186ac6e/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
----------------------------------------------------------------------