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 2012/03/14 05:25:53 UTC
[1/14] git commit: Merge branch 'cassandra-1.1.0' into cassandra-1.1
Updated Branches:
refs/heads/cassandra-1.0 34060fc77 -> f42ec6d59
refs/heads/cassandra-1.1 add6724b3 -> d025bec10
refs/heads/cassandra-1.1.0 2d6174cfa -> c29037290
Merge branch 'cassandra-1.1.0' into cassandra-1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d025bec1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d025bec1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d025bec1
Branch: refs/heads/cassandra-1.1
Commit: d025bec100dfa21b297a14103e5ae10af7aaf2c8
Parents: add6724 c290372
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Mar 13 23:24:55 2012 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Mar 13 23:24:55 2012 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
NEWS.txt | 4 ++++
examples/simple_authentication/README.txt | 11 +++++++++++
.../org/apache/cassandra/locator/Ec2Snitch.java | 9 +++++++--
.../apache/cassandra/locator/EC2SnitchTest.java | 14 +++++++++++++-
5 files changed, 36 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d025bec1/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d025bec1/NEWS.txt
----------------------------------------------------------------------
diff --cc NEWS.txt
index addf093,a588e91..4d64428
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -60,8 -60,11 +60,12 @@@ Feature
be pinned to specfic media.
- Hadoop: a new BulkOutputFormat is included which will directly write
SSTables locally and then stream them into the cluster.
+ YOU SHOULD USE BulkOutputFormat BY DEFAULT. ColumnFamilyOutputFormat
+ is still around in case for some strange reason you want results
+ trickling out over Thrift, but BulkOutputFormat is significantly
+ more efficient.
- Hadoop: KeyRange.filter is now supported with ColumnFamilyInputFormat
+ - Hadoop wide row mode added to ColumnFamilyInputFormat
- The bulk loader is not longer a fat client; it can be run from an
existing machine in a cluster.
- A new write survey mode has been added, similar to bootstrap (enabled via