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/fcd791ae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fcd791ae Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fcd791ae Branch: refs/heads/trunk Commit: fcd791ae7cc318999af6bc2773bffdff4ea6f584 Parents: fd42aa3 e23e57f Author: Sylvain Lebresne <[email protected]> Authored: Wed Mar 19 11:06:10 2014 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Wed Mar 19 11:06:10 2014 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/config/Schema.java | 4 +- .../cql3/statements/ModificationStatement.java | 39 ++++++++++++-------- 3 files changed, 27 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fcd791ae/CHANGES.txt ----------------------------------------------------------------------
