Merge pull request #97 from gianm/kafka-release

Move kafka sample file and logging configs to distribution.

build.sbt

@@ -231,6 +231,6 @@ lazy val distribution = project.in(file("distribution"))
   .settings(publishArtifact in Test := false)
   .settings(mainClass in Compile := Some("com.metamx.tranquility.distribution.DistributionMain"))
   .settings(executableScriptName := "tranquility")
-  .settings(javaOptions in Universal ++= Seq("-J-Dfile.encoding=UTF-8", "-J-Duser.timezone=UTC"))
+  .settings(bashScriptExtraDefines += """addJava "-Dlogback.configurationFile=${app_home}/../conf/logback.xml"""")
   .enablePlugins(JavaAppPackaging)
   .dependsOn(kafka, server)

kafka/src/test/java/com/metamx/tranquility/kafka/KafkaConsumerTest.java

@@ -139,7 +139,7 @@ private static KafkaConfig getKafkaTestConfig() throws Exception
     return new KafkaConfig(props);
   }
 
-  @Test(timeout = 15000)
+  @Test(timeout = 60_000L)
   public void testStartConsumersNoCommit() throws Exception
   {
     final String topic = "testStartConsumersNoCommit";
@@ -225,7 +225,7 @@ public Plumber findPlumber(DataSchema schema, RealtimeTuningConfig config, FireD
     EasyMock.verify(mockWriterController, mockEventWriter);
   }
 
-  @Test(timeout = 15000)
+  @Test(timeout = 60_000L)
   public void testStartConsumersWithCommitThread() throws Exception
   {
     final String topic = "testStartConsumersWithCommitThread";