cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [12/12] git commit: merge
Date Sun, 20 Oct 2013 01:09:34 GMT
merge


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

Branch: refs/heads/trunk
Commit: d32f1eb2128296b2077db6bffa226535852c47b9
Parents: 0a8f4ba 656d324
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Sun Oct 20 02:09:18 2013 +0100
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Sun Oct 20 02:09:18 2013 +0100

----------------------------------------------------------------------
 NEWS.txt                                        | 12 +++-
 .../io/compress/CompressedSequentialWriter.java | 12 ++++
 .../cassandra/service/StorageService.java       | 12 ++--
 .../service/LeaveAndBootstrapTest.java          | 72 ++++++++++----------
 .../org/apache/cassandra/service/MoveTest.java  | 64 ++++++++---------
 .../cassandra/tools/SSTableExportTest.java      |  4 +-
 6 files changed, 99 insertions(+), 77 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d32f1eb2/NEWS.txt
----------------------------------------------------------------------
diff --cc NEWS.txt
index f8ef5ff,519ed55..1dd2a0e
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -38,12 -38,6 +38,12 @@@ New feature
      - Compaction history and stats are now saved to system keyspace
        (system.compaction_history table). You can access historiy via
        new 'nodetool compactionhistory' command or CQL.
-     - Added a new consistenct level, LOCAL_ONE, that forces all CL.ONE operations to
++    - Added a new consistency level, LOCAL_ONE, that forces all CL.ONE operations to
 +      execute only in the local datacenter.
 +    - New replace_address to supplant the (now removed) replace_token and
 +      replace_node workflows to replace a dead node in place.  Works like the
 +      old options, but takes the IP address of the node to be replaced.
 +
  
  2.0.1
  =====


Mime
View raw message