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 2011/04/18 19:00:59 UTC

svn commit: r1094652 - /cassandra/branches/cassandra-0.8/NEWS.txt

Author: jbellis
Date: Mon Apr 18 17:00:59 2011
New Revision: 1094652

URL: http://svn.apache.org/viewvc?rev=1094652&view=rev
Log:
r/m merge artifact

Modified:
    cassandra/branches/cassandra-0.8/NEWS.txt

Modified: cassandra/branches/cassandra-0.8/NEWS.txt
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/NEWS.txt?rev=1094652&r1=1094651&r2=1094652&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/NEWS.txt (original)
+++ cassandra/branches/cassandra-0.8/NEWS.txt Mon Apr 18 17:00:59 2011
@@ -55,7 +55,6 @@ Upgrading
       data files before rebuilding, just in case.
 
 
->>>>>>> .merge-right.r1073884
 0.7.1
 =====