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/67b85218 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/67b85218 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/67b85218 Branch: refs/heads/trunk Commit: 67b852182b73b3ac95f496209c97f5957cc248bf Parents: b74c2ad 67119a5 Author: Sylvain Lebresne <[email protected]> Authored: Mon Mar 17 11:09:02 2014 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Mon Mar 17 11:09:02 2014 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ NOTICE.txt | 2 +- .../org/apache/cassandra/cql3/statements/BatchStatement.java | 8 ++++---- 3 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/67b85218/CHANGES.txt ----------------------------------------------------------------------
