Author: jbellis
Date: Sat Jan 22 07:33:36 2011
New Revision: 1062113
URL: http://svn.apache.org/viewvc?rev=1062113&view=rev
Log:
fix merge
Modified:
cassandra/trunk/src/java/org/apache/cassandra/db/RowMutation.java
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/RowMutation.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/RowMutation.java?rev=1062113&r1=1062112&r2=1062113&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/RowMutation.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/RowMutation.java Sat Jan
22 07:33:36 2011
@@ -248,16 +248,6 @@ public class RowMutation implements IMut
}
return preserializedBuffer;
}
-<<<<<<< .working
-=======
-
- public DataOutputBuffer getSerializedBuffer() throws IOException
- {
- DataOutputBuffer buffer = new DataOutputBuffer();
- RowMutation.serializer().serialize(this, buffer);
- return buffer;
- }
->>>>>>> .merge-right.r1062109
public String toString()
{
