Merge branch 'master' into 1.0.x

This commit is contained in:
David Webb
2014-06-26 09:34:12 -04:00
2 changed files with 10 additions and 1 deletions

View File

@@ -23,6 +23,6 @@ package org.springframework.cassandra.core;
*/
public enum ConsistencyLevel {
ANY, ONE, TWO, THREE, QUOROM, LOCAL_QUOROM, EACH_QUOROM, ALL
ANY, ONE, TWO, THREE, QUOROM, LOCAL_QUOROM, EACH_QUOROM, ALL, LOCAL_ONE, SERIAL, LOCAL_SERIAL
}

View File

@@ -46,6 +46,9 @@ public final class ConsistencyLevelResolver {
case ONE:
resolvedLevel = com.datastax.driver.core.ConsistencyLevel.ONE;
break;
case LOCAL_ONE:
resolvedLevel = com.datastax.driver.core.ConsistencyLevel.LOCAL_ONE;
break;
case ALL:
resolvedLevel = com.datastax.driver.core.ConsistencyLevel.ALL;
break;
@@ -67,6 +70,12 @@ public final class ConsistencyLevelResolver {
case TWO:
resolvedLevel = com.datastax.driver.core.ConsistencyLevel.TWO;
break;
case SERIAL:
resolvedLevel = com.datastax.driver.core.ConsistencyLevel.SERIAL;
break;
case LOCAL_SERIAL:
resolvedLevel = com.datastax.driver.core.ConsistencyLevel.LOCAL_SERIAL;
break;
default:
break;
}