Updated Branches: refs/heads/trunk 7d81f8cb5 -> 5df067418
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/5df06741 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5df06741 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5df06741 Branch: refs/heads/trunk Commit: 5df067418aafa2bcb47bdb0f23fb2cb8123f33a4 Parents: 7d81f8c 2fe8133 Author: Sylvain Lebresne <[email protected]> Authored: Wed Feb 13 09:20:47 2013 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Wed Feb 13 09:20:47 2013 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/io/sstable/IndexHelper.java | 6 +++--- .../cassandra/io/sstable/IndexHelperTest.java | 8 ++++---- 3 files changed, 8 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5df06741/CHANGES.txt ----------------------------------------------------------------------
