Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	NEWS.txt
This commit is contained in:
Brandon Williams 2014-01-22 17:12:35 -06:00
commit f7f9de52fd
1 changed files with 4 additions and 12 deletions

View File

@ -64,14 +64,6 @@ New features
- 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 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.
- A new CQLSSTableWriter class has been added. It is the equivalent of
the existing SSTableSimpleWriter/SSTableSimpleUnsortedWriter but is
CQL oriented.
Upgrading
---------
@ -174,7 +166,7 @@ Features
Features
--------
- 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
@ -243,9 +235,9 @@ Upgrading
Upgrading
---------
- 'nodetool upgradesstables' now only upgrade/rewrite sstables that are not
on the current version (which is usually what you want). Use the new -a
flag to recover the old behavior of rewriting all sstables.
- 'nodetool upgradesstables' now only upgrades/rewrites sstables that are
not on the current version (which is usually what you want). Use the new
-a flag to recover the old behavior of rewriting all sstables.
Features
--------