Mark Reid a08644cc93 Merge branch 'master' into reorganize_code ... Conflicts: monitoring/heka/telemetry_channel_60days.lua		2013-10-28 15:14:44 -03:00
..
server_config.spot.json	Add a new config for use by Spot Instances.	2013-10-10 10:30:52 -03:00