Add toMap and nameOf methods to CassandraRow. Reduce size of serialized CassandraRow. Fixes #194.
Ninjafix: Added test cases for #181
Merge pull request #195 from datastax/wip-194-enhance-cassandra-row

Add toMap and nameOf methods to CassandraRow. Reduce size of serialized ...
Merge branch 'b1.0' of https://github.com/datastax/spark-cassandra-connector

Conflicts:
	CHANGES.txt
Removed a conflict marker left after a merge from CHANGES.txt
201 Add information to the streaming doc and demo that Kafka, ZeroMQ.. streaming integration is coming soon.
Queries with partion keys will be accepted. This fixes issue #37 and issue #50
Fix error message on column conversion failure. Fixes #208.
Merge pull request #209 from datastax/wip-208-conversion-error-message

Fix error message on column conversion failure. Fixes #208.
#37: Fix handling of escaped quotes in CqlWhereParser. The parser preserves types of literals - e.g. it is now possible to distinguish string literals from number literals in the generated AST. Throw error when filtering on incomplete partition key. Code cleanup, fixed a few warnings.
Merge pull request #207 from datastax/wip-37-pkolaczk-partition-key-in-where

Support partition keys in where
Document global properties affecting connecting or querying in the "Connecting" section of the manual.
Merge pull request #214 from datastax/pkolaczk-document-global-properties

Document global properties affecting connecting or querying in the "Conn...
Added missing entry in CHANGES.txt for streaming demo. Fixes #115.
Fix error message on column conversion failure. Fixes #208.
Document global properties affecting connecting or querying in the "Connecting" section of the manual.
Added missing entry in CHANGES.txt for streaming demo. Fixes #115.
Merge branch 'b1.0' of https://github.com/datastax/spark-cassandra-connector

Conflicts:
	CHANGES.txt
Made the assembly integration more precise, and disabled by default for the demos module. Added a system property flag to enable assembly task for demos.
Add simple script to deploy demo assembly fat jar to local spark master. Fixes #126.

Conflicts:
	CHANGES.txt
Fixed incorrect merge with #126 breaking sbt assembly for demos.