Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/558bb724 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/558bb724 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/558bb724 Branch: refs/heads/cassandra-2.1 Commit: 558bb7246ac56ee461b7dfc791da5876cc61ab8d Parents: 0718556 af188ed Author: Aleksey Yeschenko <alek...@apache.org> Authored: Wed Aug 20 02:39:41 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Wed Aug 20 02:39:41 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/cql3/Constants.java | 4 ++-- src/java/org/apache/cassandra/cql3/UpdateParameters.java | 7 +++++++ 3 files changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/558bb724/CHANGES.txt ----------------------------------------------------------------------
