Merge branch '6202_2.0' into cassandra-2.0

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

Branch: refs/heads/cassandra-2.0
Commit: 23a530c612c7999d4df3275ba5e47a67d318953c
Parents: b0590c4 c9528f9
Author: Jason Brown <jasedbr...@gmail.com>
Authored: Thu Oct 17 14:01:02 2013 -0700
Committer: Jason Brown <jasedbr...@gmail.com>
Committed: Thu Oct 17 14:01:02 2013 -0700

----------------------------------------------------------------------
 bin/cqlsh                                       |  3 +-
 doc/cql3/CQL.textile                            |  1 +
 doc/native_protocol_v1.spec                     |  1 +
 doc/native_protocol_v2.spec                     |  1 +
 interface/cassandra.thrift                      |  5 +++-
 .../cassandra/thrift/ConsistencyLevel.java      |  7 ++++-
 .../cassandra/thrift/cassandraConstants.java    |  2 +-
 .../apache/cassandra/db/ConsistencyLevel.java   | 29 ++++++++++++++++----
 .../locator/AbstractReplicationStrategy.java    |  2 +-
 .../service/DatacenterWriteResponseHandler.java |  2 +-
 .../apache/cassandra/service/ReadCallback.java  |  2 +-
 .../cassandra/thrift/ThriftConversion.java      |  1 +
 12 files changed, 44 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


Reply via email to