You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/05/08 01:15:47 UTC
[1/3] git commit: don't use o.a.commons.io for one method
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 ce7bf5e99 -> 39b0d0e3e
refs/heads/trunk d6eb9e8bd -> 9ffb19569
don't use o.a.commons.io for one method
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/39b0d0e3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/39b0d0e3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/39b0d0e3
Branch: refs/heads/cassandra-2.1
Commit: 39b0d0e3efe3f0b58c317a0fa8766dc99ad5ec11
Parents: ce7bf5e
Author: Brandon Williams <br...@apache.org>
Authored: Wed May 7 18:11:47 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed May 7 18:11:47 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/39b0d0e3/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index c5afb25..33b7303 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -17,9 +17,7 @@
*/
package org.apache.cassandra.db;
-import java.io.File;
-import java.io.FileFilter;
-import java.io.IOException;
+import java.io.*;
import java.lang.management.ManagementFactory;
import java.nio.ByteBuffer;
import java.util.*;
@@ -2173,9 +2171,12 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
final JSONObject manifestJSON = new JSONObject();
manifestJSON.put("files", filesJSONArr);
+
try
{
- org.apache.commons.io.FileUtils.writeStringToFile(manifestFile, manifestJSON.toJSONString());
+ PrintStream out = new PrintStream(manifestFile);
+ out.println(manifestJSON.toJSONString());
+ out.close();
}
catch (IOException e)
{
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by br...@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/9ffb1956
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9ffb1956
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9ffb1956
Branch: refs/heads/trunk
Commit: 9ffb195697c80e71a16fd7b5ca6672f32b18b658
Parents: d6eb9e8 39b0d0e
Author: Brandon Williams <br...@apache.org>
Authored: Wed May 7 18:11:56 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed May 7 18:11:56 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[2/3] git commit: don't use o.a.commons.io for one method
Posted by br...@apache.org.
don't use o.a.commons.io for one method
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/39b0d0e3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/39b0d0e3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/39b0d0e3
Branch: refs/heads/trunk
Commit: 39b0d0e3efe3f0b58c317a0fa8766dc99ad5ec11
Parents: ce7bf5e
Author: Brandon Williams <br...@apache.org>
Authored: Wed May 7 18:11:47 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed May 7 18:11:47 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/39b0d0e3/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index c5afb25..33b7303 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -17,9 +17,7 @@
*/
package org.apache.cassandra.db;
-import java.io.File;
-import java.io.FileFilter;
-import java.io.IOException;
+import java.io.*;
import java.lang.management.ManagementFactory;
import java.nio.ByteBuffer;
import java.util.*;
@@ -2173,9 +2171,12 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
final JSONObject manifestJSON = new JSONObject();
manifestJSON.put("files", filesJSONArr);
+
try
{
- org.apache.commons.io.FileUtils.writeStringToFile(manifestFile, manifestJSON.toJSONString());
+ PrintStream out = new PrintStream(manifestFile);
+ out.println(manifestJSON.toJSONString());
+ out.close();
}
catch (IOException e)
{