Merge branch 'DATACASS-11' of

https://github.com/shvid/spring-data-cassandra into DATACASS-11

Conflicts:
	src/main/java/org/springframework/data/cassandra/convert/MappingCassandraConverter.java
This commit is contained in:
Alex Shvid
2013-11-16 22:26:19 -08:00

View File

@@ -234,7 +234,8 @@ public class MappingCassandraConverter extends AbstractCassandraConverter implem
}
private void writeDeleteWhereInternal(final Object objectToSave, final Where whereId, CassandraPersistentEntity<?> entity) {
private void writeDeleteWhereInternal(final Object objectToSave, final Where whereId,
CassandraPersistentEntity<?> entity) {
final BeanWrapper<CassandraPersistentEntity<Object>, Object> wrapper = BeanWrapper.create(objectToSave,
conversionService);