You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/05/26 02:21:58 UTC
[1/3] git commit: clean up merge
Updated Branches:
refs/heads/cassandra-1.2 7c9f17f95 -> 234d4cfeb
refs/heads/trunk 6d27cc884 -> 0b36afa62
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/cassandra-1.2
Commit: 234d4cfebaa869e739c0175ed3f50970186ecad1
Parents: 7c9f17f
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sat May 25 19:21:27 2013 -0500
Committer: Jonathan Ellis <jb...@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
[2/3] git commit: clean up merge
Posted by jb...@apache.org.
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 <jb...@apache.org>
Authored: Sat May 25 19:21:27 2013 -0500
Committer: Jonathan Ellis <jb...@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
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Posted by jb...@apache.org.
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/0b36afa6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0b36afa6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0b36afa6
Branch: refs/heads/trunk
Commit: 0b36afa6268d74e6d12c8b9c0c81736ef98195cf
Parents: 6d27cc8 234d4cf
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sat May 25 19:21:52 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Sat May 25 19:21:52 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 8 --------
1 files changed, 0 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b36afa6/CHANGES.txt
----------------------------------------------------------------------