cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [4/6] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2
Date Sat, 23 Feb 2013 16:25:05 GMT
Merge branch 'cassandra-1.1' into cassandra-1.2


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9d0571ac
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9d0571ac
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9d0571ac

Branch: refs/heads/trunk
Commit: 9d0571acf4c60437d4685dad90f30172a5c2355d
Parents: d055df7 3b98e63
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Sat Feb 23 10:24:31 2013 -0600
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Sat Feb 23 10:24:31 2013 -0600

----------------------------------------------------------------------
 src/java/org/apache/cassandra/tools/NodeCmd.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9d0571ac/src/java/org/apache/cassandra/tools/NodeCmd.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/tools/NodeCmd.java
index 9b844b1,3582f6b..8cd8b56
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@@ -1362,12 -1056,12 +1362,12 @@@ public class NodeCm
                      break;
                  case COMPACT :
                      try { probe.forceTableCompaction(keyspace, columnFamilies); }
-                     catch (ExecutionException ee) { err(ee, "Error occured during compaction");
}
+                     catch (ExecutionException ee) { err(ee, "Error occurred during compaction");
}
                      break;
                  case CLEANUP :
 -                    if (keyspace.equals("system")) { break; } // Skip cleanup on system
cfs.
 +                    if (keyspace.equals(Table.SYSTEM_KS)) { break; } // Skip cleanup on
system cfs.
                      try { probe.forceTableCleanup(keyspace, columnFamilies); }
-                     catch (ExecutionException ee) { err(ee, "Error occured during cleanup");
}
+                     catch (ExecutionException ee) { err(ee, "Error occurred during cleanup");
}
                      break;
                  case SCRUB :
                      try { probe.scrub(keyspace, columnFamilies); }


Mime
View raw message