#101 #133 Fixed another scaladoc warning.
Merge branch 'b1.0' of github.com:datastax/spark-cassandra-connector into b1.0
Get rid of deprecated warning in TableWriterSpec.
Update 1_connecting.md

Add `spark.` to the references to `cassandra.connection.host` and `cassandra.connection.keep_alive_ms`.
Added assembly target for building uberjar
Merge pull request #150 from tsindot/patch-4

Update 1_connecting.md
#158 Remove compiler warning when publish credentials do not exist (i.e. for those without publish permissions).
Merge pull request #160 from datastax/wip-158-fix-warning

#158 Remove compiler warning when publish credentials do not exist (i.e. for those without publish permissions).
Moved assembly settings to Settings.scala & moved plugin to plugins.sbt
Merge pull request #152 from TheWeatherChannel/master

Added assembly target for building uberjar
allow configuration of multiple comma-separated connection hosts, in case one is down
fix speling, add CHANGES.txt
reformat code & catch all nonfatal exceptions, per committer feedback
add CassandraRDD.getPreferredLocations implementation. This fixes issue #164
formatting change
Merge pull request #163 from mediacrossinginc/mx_multiseed

Allow multiple comma-separated hosts in spark.cassandra.connection.host
Merge pull request #165 from datastax/issue-164

add CassandraRDD.getPreferredLocations implementation. This fixes issue #164
Merge branch 'b1.0' of https://github.com/datastax/spark-cassandra-connector
Add missing CHANGES.txt entry for #164
Merge branch 'b1.0' of https://github.com/datastax/spark-cassandra-connector

Conflicts:
	CHANGES.txt