Updated Branches: refs/heads/trunk b85c93e0a -> 208d77b7a
Remove merge markers in changelog Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/208d77b7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/208d77b7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/208d77b7 Branch: refs/heads/trunk Commit: 208d77b7a3ed06980f0077bdd3ffc91572a24c1e Parents: b85c93e Author: Sylvain Lebresne <[email protected]> Authored: Tue Sep 11 17:22:24 2012 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Tue Sep 11 17:22:24 2012 +0200 ---------------------------------------------------------------------- CHANGES.txt | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/208d77b7/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 00971a5..c06554f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -100,10 +100,7 @@ Merged from 1.0: * (Hadoop) fix setting key length for old-style mapred api (CASSANDRA-4534) * (Hadoop) fix iterating through a resultset consisting entirely of tombstoned rows (CASSANDRA-4466) -<<<<<<< HEAD * Fix multiple values for CurrentLocal NodeID (CASSANDRA-4626) -======= ->>>>>>> cassandra-1.1 * munmap commitlog segments before rename (CASSANDRA-4337)
