Updated Branches: refs/heads/trunk 1ffdaae24 -> 7d539d754
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7d539d75 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7d539d75 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7d539d75 Branch: refs/heads/trunk Commit: 7d539d75467ea929acc32870b52148b24ec51d1a Parents: 1ffdaae b664c55 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Fri Jan 11 19:42:22 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Fri Jan 11 19:42:22 2013 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/cql3/statements/BatchStatement.java | 17 ++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7d539d75/CHANGES.txt ----------------------------------------------------------------------
