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/07/02 10:39:39 UTC
[5/7] git commit: Merge branch 'cassandra-2.1.0' of
https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.1.0
Merge branch 'cassandra-2.1.0' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f3961a63
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f3961a63
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f3961a63
Branch: refs/heads/trunk
Commit: f3961a63a141803ff35a0580da7ceb23fe3038fc
Parents: 3e807b6 6aa81a5
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Jul 2 10:30:14 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Jul 2 10:30:14 2014 +0200
----------------------------------------------------------------------
.../org/apache/cassandra/cql3/statements/SelectStatement.java | 2 +-
src/java/org/apache/cassandra/utils/ByteBufferUtil.java | 5 +----
test/conf/cassandra.yaml | 1 +
3 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------