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/6cecbf91 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6cecbf91 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6cecbf91 Branch: refs/heads/trunk Commit: 6cecbf914d7608a5111cafbb220b3a7e41b8fb5d Parents: 2629c30 9da58ed Author: Sylvain Lebresne <[email protected]> Authored: Wed May 7 11:08:28 2014 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Wed May 7 11:08:28 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 4 ---- .../cassandra/cql3/statements/BatchStatement.java | 13 ++++++++++++- .../cql3/statements/ModificationStatement.java | 3 --- 3 files changed, 12 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6cecbf91/CHANGES.txt ----------------------------------------------------------------------
