Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1a301a9c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1a301a9c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1a301a9c Branch: refs/heads/trunk Commit: 1a301a9cada13c8cff4aedc6f2e25a4199d2d178 Parents: eb2c4fe 46f7186 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Mon Oct 28 15:53:05 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Mon Oct 28 15:53:05 2013 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/cql3/statements/ModificationStatement.java | 4 ++++ src/java/org/apache/cassandra/thrift/CassandraServer.java | 2 ++ 3 files changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a301a9c/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a301a9c/src/java/org/apache/cassandra/thrift/CassandraServer.java ----------------------------------------------------------------------
