You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2014/05/01 11:46:43 UTC
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c0be3418
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c0be3418
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c0be3418
Branch: refs/heads/trunk
Commit: c0be34182b0051fd9881d268244408c33cdcb846
Parents: e78b002 233761e
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu May 1 11:46:29 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu May 1 11:46:29 2014 +0200
----------------------------------------------------------------------
src/java/org/apache/cassandra/cql3/QueryOptions.java | 4 +---
.../cassandra/serializers/CollectionSerializer.java | 10 ++++++----
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------