Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9da58ed3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9da58ed3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9da58ed3
Branch: refs/heads/trunk
Commit: 9da58ed3540cb239460b6195a1124316dfbec709
Parents: 0ca4942 2e61cd5
Author: Sylvain Lebresne <[email protected]>
Authored: Wed May 7 11:07:58 2014 +0200
Committer: Sylvain Lebresne <[email protected]>
Committed: Wed May 7 11:07:58 2014 +0200
----------------------------------------------------------------------
src/java/org/apache/cassandra/cql3/statements/BatchStatement.java | 2 ++
.../apache/cassandra/cql3/statements/ModificationStatement.java | 3 ---
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9da58ed3/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9da58ed3/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
----------------------------------------------------------------------
