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/21827fac Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/21827fac Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/21827fac Branch: refs/heads/trunk Commit: 21827fac6d534802b8c8120bccc68e5b15863a76 Parents: 2cc6313 9f208b0 Author: Tyler Hobbs <ty...@datastax.com> Authored: Thu Aug 28 10:48:21 2014 -0500 Committer: Tyler Hobbs <ty...@datastax.com> Committed: Thu Aug 28 10:48:21 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/cql3/statements/ModificationStatement.java | 1 + 2 files changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/21827fac/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/21827fac/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java ----------------------------------------------------------------------
