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/f281a837 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f281a837 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f281a837 Branch: refs/heads/trunk Commit: f281a837bdd699545ea849c70dc5ce228c0b42c0 Parents: 22e18f5 41d64cd Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Dec 2 20:56:49 2013 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Dec 2 20:56:49 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/gms/VersionedValue.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f281a837/CHANGES.txt ----------------------------------------------------------------------
