cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jasobr...@apache.org
Subject [8/8] git commit: Merge branch 'cassandra-2.0' into trunk
Date Thu, 17 Oct 2013 21:10:52 GMT
Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 231b345ffd1fe2d8927866b81ef94276e67fd8f2
Parents: 4e53d1e 20d91b0
Author: Jason Brown <jasedbrown@gmail.com>
Authored: Thu Oct 17 14:09:45 2013 -0700
Committer: Jason Brown <jasedbrown@gmail.com>
Committed: Thu Oct 17 14:09:45 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 +-
 lib/cql-internal-only-1.4.0.zip                 | Bin 91982 -> 92738 bytes
 .../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 +
 13 files changed, 44 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/231b345f/src/java/org/apache/cassandra/thrift/ThriftConversion.java
----------------------------------------------------------------------


Mime
View raw message