Merge remote-tracking branch 'origin/Bj0rnen/CanRepair' into Bj0rnen/… · thelastpickle/cassandra-reaper@0da9b92 · GitHub

Commit

Merge remote-tracking branch 'origin/Bj0rnen/CanRepair' into Bj0rnen/…

Browse files

…CanRepair

Conflicts:
	src/main/java/com/spotify/reaper/cassandra/JmxConnectionFactory.java
	src/main/java/com/spotify/reaper/service/SegmentRunner.java

Loading branch information

Bj0rnen committed Jan 23, 2015

2 parents eee0bfd + 757cff2 commit 0da9b92