홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
aca94ea0 2 parents b14c77af 280ed8ab

Merge remote-tracking branch 'origin/master'

Inline Side-by-side
Showing 1 changed file with 2 additions and 4 deletions
...@@ -15,10 +15,8 @@ import net.kuujo.copycat.log.ChronicleLog; ...@@ -15,10 +15,8 @@ import net.kuujo.copycat.log.ChronicleLog;
15 import net.kuujo.copycat.log.Log; 15 import net.kuujo.copycat.log.Log;
16 16
17 import org.apache.felix.scr.annotations.Activate; 17 import org.apache.felix.scr.annotations.Activate;
18 -import org.apache.felix.scr.annotations.Component;
19 import org.apache.felix.scr.annotations.Reference; 18 import org.apache.felix.scr.annotations.Reference;
20 import org.apache.felix.scr.annotations.ReferenceCardinality; 19 import org.apache.felix.scr.annotations.ReferenceCardinality;
21 -import org.apache.felix.scr.annotations.Service;
22 import org.onlab.netty.Endpoint; 20 import org.onlab.netty.Endpoint;
23 import org.onlab.onos.cluster.ClusterService; 21 import org.onlab.onos.cluster.ClusterService;
24 import org.onlab.onos.cluster.ControllerNode; 22 import org.onlab.onos.cluster.ControllerNode;
...@@ -42,8 +40,8 @@ import com.google.common.collect.Lists; ...@@ -42,8 +40,8 @@ import com.google.common.collect.Lists;
42 * Strongly consistent and durable state management service based on 40 * Strongly consistent and durable state management service based on
43 * Copycat implementation of Raft consensus protocol. 41 * Copycat implementation of Raft consensus protocol.
44 */ 42 */
45 -@Component(immediate = true) 43 +//@Component(immediate = true)
46 -@Service 44 +//@Service
47 public class DatabaseManager implements DatabaseService, DatabaseAdminService { 45 public class DatabaseManager implements DatabaseService, DatabaseAdminService {
48 46
49 private final Logger log = getLogger(getClass()); 47 private final Logger log = getLogger(getClass());
......