Updated Branches: refs/heads/cassandra-1.2 e4b3d403f -> c688125ba refs/heads/trunk c7230f2e2 -> b88867ffa
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/b88867ff Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b88867ff Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b88867ff Branch: refs/heads/trunk Commit: b88867ffa934bbcfc1abe6df4c8c18da62e7a9a0 Parents: c7230f2 c688125 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Mar 13 13:34:28 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Mar 13 13:34:28 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/io/sstable/Descriptor.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b88867ff/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b88867ff/src/java/org/apache/cassandra/io/sstable/Descriptor.java ----------------------------------------------------------------------
