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

Branch: refs/heads/trunk
Commit: c1ce969c6a8e529d98eb8abec6b42e2f0acf3851
Parents: e88c830 bf9b49c
Author: Aleksey Yeschenko <[email protected]>
Authored: Fri Jun 20 15:49:07 2014 -0700
Committer: Aleksey Yeschenko <[email protected]>
Committed: Fri Jun 20 15:49:07 2014 -0700

----------------------------------------------------------------------
 .../cql3/statements/BatchStatement.java         | 20 ++++++++------------
 .../transport/messages/BatchMessage.java        | 14 +++++---------
 2 files changed, 13 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


Reply via email to