Merge ControlPlane into OneService to make variable access simpler.

2017-03-07 13:53:11 -08:00
parent 712e8e828b
commit 22f86df606
5 changed files with 521 additions and 696 deletions
--- a/objects.mk
+++ b/objects.mk
@@ -31,5 +31,4 @@ OBJS=\
 	osdep/Http.o \
 	osdep/OSUtils.o \
 	service/ClusterGeoIpService.o \
-	service/ControlPlane.o \
 	service/SoftwareUpdater.o