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/fea7d9a0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fea7d9a0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fea7d9a0

Branch: refs/heads/trunk
Commit: fea7d9a0311ad5d52696d8bfaf920acfd191be84
Parents: c183f55 f4037ed
Author: Sylvain Lebresne <sylv...@datastax.com>
Authored: Fri Oct 17 11:55:26 2014 +0200
Committer: Sylvain Lebresne <sylv...@datastax.com>
Committed: Fri Oct 17 11:55:26 2014 +0200

----------------------------------------------------------------------
 CHANGES.txt                                      |  1 +
 .../cql3/statements/DeleteStatement.java         | 19 +++++++++++++++++++
 .../cql3/statements/ModificationStatement.java   | 14 +++++++++++++-
 3 files changed, 33 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fea7d9a0/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fea7d9a0/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
----------------------------------------------------------------------

Reply via email to