Merge branch 'b1.3'

jacek-lewandowski · jacek-lewandowski · commit 55b3ca901053 · 2015-06-29T10:41:03.000+02:00
diff --git a/spark-cassandra-connector/src/main/scala/com/datastax/spark/connector/writer/package.scala b/spark-cassandra-connector/src/main/scala/com/datastax/spark/connector/writer/package.scala
@@ -3,6 +3,4 @@ package com.datastax.spark.connector
 /** Contains components for writing RDDs to Cassandra */
 package object writer {
 
-  case class NullKeyColumnException(columnName: String)
-    extends NullPointerException(s"Invalid null value for key column $columnName")
 }

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,4 @@ package com.datastax.spark.connector`
`3`	`3`	`/** Contains components for writing RDDs to Cassandra */`
`4`	`4`	`package object writer {`
`5`	`5`
`6`		`- case class NullKeyColumnException(columnName: String)`
`7`		`- extends NullPointerException(s"Invalid null value for key column $columnName")`
`8`	`6`	`}`