Updated Branches: refs/heads/trunk 7b65883d8 -> a17f0ed4e
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a17f0ed4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a17f0ed4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a17f0ed4 Branch: refs/heads/trunk Commit: a17f0ed4e95329c43bdf1d47c9e7002ec00f0c14 Parents: 7b65883 7c920b0 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Fri Mar 1 14:30:40 2013 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Fri Mar 1 14:30:40 2013 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/cql3/Operation.java | 3 +++ 2 files changed, 5 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a17f0ed4/CHANGES.txt ----------------------------------------------------------------------
