Permalink
Browse files

Merge remote-tracking branch 'origin/1.0-compat'

  • Loading branch information...
thobbs committed Nov 7, 2011
2 parents 028eec7 + fd19994 commit 3fb8161cb396b74d24cd083d825a302d8b563055
View
@@ -10,7 +10,8 @@ with the following features:
* A batch interface
* A class for mapping classes to Cassandra column families
-The latest release is compatible with Cassandra 0.7 and 0.8.
+The latest release is fully compatible with Cassandra 0.8 and 1.0, and
+compatible with data API of 0.7.
*pycassa* is open source under the [MIT license](http://www.opensource.org/licenses/mit-license.php).
@@ -123,7 +123,7 @@ Example usage:
Index Type: KEYS
Index Name: None
- >>> SYSTEM_MANAGER.create_keyspace('Keyspace1', replication_factor=1)
+ >>> SYSTEM_MANAGER.create_keyspace('Keyspace1', strategy_options={"replication_factor": "1"})
>>> SYSTEM_MANAGER.create_column_family('Keyspace1', 'Users', comparator_type=INT_TYPE)
>>> SYSTEM_MANAGER.alter_column_family('Keyspace1', 'Users', key_cache_size=100)
>>> SYSTEM_MANAGER.create_index('Keyspace1', 'Users', 'birthdate', LONG_TYPE, index_name='bday_index')
View
@@ -92,7 +92,7 @@ Here's how to create the keyspace and column family:
.. code-block:: python
- >>> SYSTEM_MANAGER.create_keyspace('Keyspace1', replication_factor=1)
+ >>> SYSTEM_MANAGER.create_keyspace('Keyspace1', strategy_options={"replication_factor": "1"})
>>> SYSTEM_MANAGER.create_column_family('Keyspace1', 'ColumnFamily1')
Connecting to Cassandra
@@ -1,10 +1 @@
-#
-# Autogenerated by Thrift
-#
-# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
-#
-
-from thrift.Thrift import *
-from ttypes import *
-
VERSION = "19.4.0"
Oops, something went wrong.

0 comments on commit 3fb8161

Please sign in to comment.