Moving to Copycat version 0.5.0.onos12-SNAPSHOT to pick up latest fixes
Change-Id: I1c7851f67b30b706319682b850c6398777ba32f2
Showing
3 changed files
with
6 additions
and
3 deletions
... | @@ -321,7 +321,7 @@ public class DatabaseManager implements StorageService, StorageAdminService { | ... | @@ -321,7 +321,7 @@ public class DatabaseManager implements StorageService, StorageAdminService { |
321 | .withName(name) | 321 | .withName(name) |
322 | .withElectionTimeout(electionTimeoutMillis(replicas)) | 322 | .withElectionTimeout(electionTimeoutMillis(replicas)) |
323 | .withHeartbeatInterval(heartbeatTimeoutMillis(replicas)) | 323 | .withHeartbeatInterval(heartbeatTimeoutMillis(replicas)) |
324 | - .withConsistency(Consistency.STRONG) | 324 | + .withConsistency(Consistency.DEFAULT) |
325 | .withLog(log) | 325 | .withLog(log) |
326 | .withDefaultSerializer(new DatabaseSerializer()) | 326 | .withDefaultSerializer(new DatabaseSerializer()) |
327 | .withReplicas(replicas); | 327 | .withReplicas(replicas); | ... | ... |
... | @@ -42,7 +42,10 @@ public class DefaultDatabase extends AbstractResource<Database> implements Datab | ... | @@ -42,7 +42,10 @@ public class DefaultDatabase extends AbstractResource<Database> implements Datab |
42 | @SuppressWarnings({ "unchecked", "rawtypes" }) | 42 | @SuppressWarnings({ "unchecked", "rawtypes" }) |
43 | public DefaultDatabase(ResourceManager context) { | 43 | public DefaultDatabase(ResourceManager context) { |
44 | super(context); | 44 | super(context); |
45 | - this.stateMachine = new DefaultStateMachine(context, DatabaseState.class, DefaultDatabaseState.class); | 45 | + this.stateMachine = new DefaultStateMachine(context, |
46 | + DatabaseState.class, | ||
47 | + DefaultDatabaseState.class, | ||
48 | + DefaultDatabase.class.getClassLoader()); | ||
46 | } | 49 | } |
47 | 50 | ||
48 | /** | 51 | /** | ... | ... |
... | @@ -72,7 +72,7 @@ | ... | @@ -72,7 +72,7 @@ |
72 | <properties> | 72 | <properties> |
73 | <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | 73 | <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> |
74 | <netty4.version>4.0.23.Final</netty4.version> | 74 | <netty4.version>4.0.23.Final</netty4.version> |
75 | - <copycat.version>0.4.1.onos</copycat.version> | 75 | + <copycat.version>0.5.0.onos12-SNAPSHOT</copycat.version> |
76 | <openflowj.version>0.4.0.onos</openflowj.version> | 76 | <openflowj.version>0.4.0.onos</openflowj.version> |
77 | <karaf.version>3.0.3</karaf.version> | 77 | <karaf.version>3.0.3</karaf.version> |
78 | <jersey.version>1.19</jersey.version> | 78 | <jersey.version>1.19</jersey.version> | ... | ... |
-
Please register or login to post a comment