Projects >> flume-cassandra-plugin >>e2f6d14950f214d9356455861d09f81b642d0cce

Chunk
Conflicting content
    // Make the index column
    UUID uuid = TimeUUIDUtils.getTimeUUID(timestamp);
    Column indexColumn = new Column();
<<<<<<< HEAD:src/java/org/apache/cassandra/plugins/flume/sink/SimpleCassandraSink.java
            indexColumn.setName(uuid.toByteArray());
            indexColumn.setValue(new byte[0]);
            indexColumn.setTimestamp(timestamp);
=======
			indexColumn.setName(TimeUUIDUtils.asByteArray(uuid));
			indexColumn.setValue(new byte[0]);
			indexColumn.setTimestamp(timestamp);
>>>>>>> d4cd56d9293a57d5cf15800679aa4ada3ff79e2f:src/java/org/apache/cassandra/plugins/SimpleCassandraSink.java

    // Make the data column
    Column dataColumn = new Column();
Solution content
    // Make the index column
    UUID uuid = TimeUUIDUtils.getTimeUUID(timestamp);
    Column indexColumn = new Column();
    indexColumn.setName(TimeUUIDUtils.asByteArray(uuid));
    indexColumn.setValue(new byte[0]);
    indexColumn.setTimestamp(timestamp);

    // Make the data column
    Column dataColumn = new Column();
File
SimpleCassandraSink.java
Developer's decision
Version 2
Kind of conflict
Method invocation