Merge pull request #322 from vmarmol/cleanup

Misc cleanups

manager/container.go

@@ -32,11 +32,6 @@ var HousekeepingInterval = flag.Duration("housekeeping_interval", 1*time.Second,
 var maxHousekeepingInterval = flag.Duration("max_housekeeping_interval", 60*time.Second, "Largest interval to allow between container housekeepings")
 var allowDynamicHousekeeping = flag.Bool("allow_dynamic_housekeeping", true, "Whether to allow the housekeeping interval to be dynamic")
 
-// Internal mirror of the external data structure.
-type containerStat struct {
-	Timestamp time.Time
-	Data      *info.ContainerStats
-}
 type containerInfo struct {
 	info.ContainerReference
 	Subcontainers []info.ContainerReference

manager/manager.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// TODO(cAdvisor): Package comment.
+// Manager of cAdvisor-monitored containers.
 package manager
 
 import (
@@ -501,11 +501,6 @@ func (m *manager) detectSubcontainers(containerName string) error {
 	return nil
 }
 
-func (self *manager) processEvent(event container.SubcontainerEvent) error {
-	// TODO(cAdvisor): Why does this method always return nil? [satnam6502]
-	return nil
-}
-
 // Watches for new containers started in the system. Runs forever unless there is a setup error.
 func (self *manager) watchForNewContainers(quit chan error) error {
 	var root *containerData