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/462c2dcc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/462c2dcc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/462c2dcc Branch: refs/heads/trunk Commit: 462c2dcc0d2f737e8bc9620d2e72eeffbc6dad08 Parents: d224c0f 2b89cf6 Author: Mikhail Stepura <[email protected]> Authored: Mon Apr 21 14:54:54 2014 -0700 Committer: Mikhail Stepura <[email protected]> Committed: Mon Apr 21 14:54:54 2014 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/statements/BatchStatement.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/462c2dcc/CHANGES.txt ----------------------------------------------------------------------
