You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2015/05/08 16:30:00 UTC
[1/3] cassandra git commit: use cross-platform %n
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 e2ad784c7 -> 135151e53
refs/heads/trunk 3ef932af7 -> c7db18be8
use cross-platform %n
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/135151e5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/135151e5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/135151e5
Branch: refs/heads/cassandra-2.1
Commit: 135151e53e8e9dce7b80ada74edbabaf67a45f43
Parents: e2ad784
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri May 8 09:29:31 2015 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri May 8 09:29:31 2015 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/StandaloneUpgrader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/135151e5/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java b/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java
index 22c57f7..9057998 100644
--- a/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java
+++ b/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java
@@ -106,7 +106,7 @@ public class StandaloneUpgrader
if (!options.keepSource)
{
// Remove the sstable (it's been copied by upgrade)
- System.out.format("Deleting table %s.\n", sstable.descriptor.baseFilename());
+ System.out.format("Deleting table %s.%n", sstable.descriptor.baseFilename());
sstable.markObsolete();
sstable.selfRef().release();
}
[3/3] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by jb...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c7db18be
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c7db18be
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c7db18be
Branch: refs/heads/trunk
Commit: c7db18be827a24d16998c39746c83da4516292f7
Parents: 3ef932a 135151e
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri May 8 09:29:40 2015 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri May 8 09:29:40 2015 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/StandaloneUpgrader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7db18be/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java
----------------------------------------------------------------------
[2/3] cassandra git commit: use cross-platform %n
Posted by jb...@apache.org.
use cross-platform %n
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/135151e5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/135151e5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/135151e5
Branch: refs/heads/trunk
Commit: 135151e53e8e9dce7b80ada74edbabaf67a45f43
Parents: e2ad784
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri May 8 09:29:31 2015 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri May 8 09:29:31 2015 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/StandaloneUpgrader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/135151e5/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java b/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java
index 22c57f7..9057998 100644
--- a/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java
+++ b/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java
@@ -106,7 +106,7 @@ public class StandaloneUpgrader
if (!options.keepSource)
{
// Remove the sstable (it's been copied by upgrade)
- System.out.format("Deleting table %s.\n", sstable.descriptor.baseFilename());
+ System.out.format("Deleting table %s.%n", sstable.descriptor.baseFilename());
sstable.markObsolete();
sstable.selfRef().release();
}