Merge branch 'master' of git.hpcloud.net:mon/mon-persister

Conflicts:
	src/main/java/com/hpcloud/mon/persister/consumer/AlarmStateTransitionsConsumer.java
	src/main/java/com/hpcloud/mon/persister/consumer/MetricsConsumer.java
This commit is contained in:
Roland Hochmuth 2014-04-11 22:06:35 -06:00
parent f444d91e70
commit ed82aee920
1 changed files with 1 additions and 1 deletions

View File

@ -1,4 +1,4 @@
papackage com.hpcloud.mon.persister.consumer;
package com.hpcloud.mon.persister.consumer;
import com.google.inject.Inject;
import com.hpcloud.mon.persister.disruptor.MetricDisruptor;