cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [2/3] git commit: clean up merge
Date Sun, 26 May 2013 00:21:59 GMT
clean up merge


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/234d4cfe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/234d4cfe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/234d4cfe

Branch: refs/heads/trunk
Commit: 234d4cfebaa869e739c0175ed3f50970186ecad1
Parents: 7c9f17f
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Sat May 25 19:21:27 2013 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Sat May 25 19:21:31 2013 -0500

----------------------------------------------------------------------
 CHANGES.txt |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/234d4cfe/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 1acf84e..d3973b6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -92,7 +92,6 @@ Merged from 1.1:
    (CASSANDRA-5242)
  * Support pluggable internode authentication (CASSANDRA-5401)
 
-<<<<<<< HEAD
 
 1.2.3
  * add check for sstable overlap within a level on startup (CASSANDRA-5327)
@@ -118,14 +117,7 @@ Merged from 1.1:
  * Fix AssertionError during repair (CASSANDRA-5245)
  * Don't announce migrations to pre-1.2 nodes (CASSANDRA-5334)
 Merged from 1.1:
-||||||| merged common ancestors
-1.1.11
  * Fix trying to load deleted row into row cache on startup (CASSANDRA-4463)
-=======
-
-1.1.11
- * Fix trying to load deleted row into row cache on startup (CASSANDRA-4463)
->>>>>>> cassandra-1.1
  * Update offline scrub for 1.0 -> 1.1 directory structure (CASSANDRA-5195)
  * add tmp flag to Descriptor hashcode (CASSANDRA-4021)
  * fix logging of "Found table data in data directories" when only system tables


Mime
View raw message