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/45bb9246 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/45bb9246 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/45bb9246 Branch: refs/heads/trunk Commit: 45bb924673df3867c43e16d19974ea5427c323b5 Parents: 5f5905d 4169aa3 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Oct 30 17:22:32 2013 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Oct 30 17:22:32 2013 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/cql3/QueryOptions.java | 27 +++++++++++++++++--- .../cql3/statements/ModificationStatement.java | 3 +++ .../cassandra/transport/SimpleClient.java | 5 ++-- .../transport/messages/ExecuteMessage.java | 7 +---- .../transport/messages/QueryMessage.java | 7 +---- 6 files changed, 31 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/45bb9246/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/45bb9246/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java ----------------------------------------------------------------------
