fix merge conflicts

Author: Matt Stump

build.sbt

@@ -9,6 +9,6 @@ libraryDependencies ++= Seq(
   "org.apache.spark" %% "spark-core" % "1.1.0",
   "org.apache.spark" %% "spark-streaming" % "1.1.0",
   "org.apache.spark" %% "spark-sql" % "1.1.0",
-  "com.datastax.spark" %% "spark-cassandra-connector" % "1.1.0",
+  "com.datastax.spark" %% "spark-cassandra-connector" % "1.1.1",
   "org.apache.spark" %% "spark-streaming-kafka" % "1.1.0"
 )

src/main/scala/Test.scala

@@ -113,6 +113,11 @@ object StreamConsumer {
     parsedRecords.saveToCassandra(Config.cassandraKeyspace, Config.cassandraCfEvents)
     flattenCounts.saveToCassandra(Config.cassandraKeyspace, Config.cassandraCfCounters)
 
+    // https://twitter.com/pwendell/status/580242656082546688
+    sys.ShutdownHookThread {
+      ssc.stop(true, true)
+    }
+
     ssc.start()
     ssc.awaitTermination()
   }