You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2011/02/08 19:44:03 UTC

svn commit: r1068518 - /cassandra/branches/cassandra-0.7/contrib/client_only/conf/cassandra.yaml

Author: brandonwilliams
Date: Tue Feb  8 18:44:02 2011
New Revision: 1068518

URL: http://svn.apache.org/viewvc?rev=1068518&view=rev
Log:
Fix client_only config for 0.7

Modified:
    cassandra/branches/cassandra-0.7/contrib/client_only/conf/cassandra.yaml

Modified: cassandra/branches/cassandra-0.7/contrib/client_only/conf/cassandra.yaml
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/contrib/client_only/conf/cassandra.yaml?rev=1068518&r1=1068517&r2=1068518&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/contrib/client_only/conf/cassandra.yaml (original)
+++ cassandra/branches/cassandra-0.7/contrib/client_only/conf/cassandra.yaml Tue Feb  8 18:44:02 2011
@@ -90,17 +90,12 @@ commitlog_sync: periodic
 # milliseconds.
 commitlog_sync_period_in_ms: 10000
 
-# any class that implements the SeedProvider interface and has a constructor that takes a Map<String, String> of
-# parameters will do.
-seed_provider:
-    # Addresses of hosts that are deemed contact points. 
-    # Cassandra nodes use this list of hosts to find each other and learn
-    # the topology of the ring.  You must change this if you are running
-    # multiple nodes!
-    - class_name: org.apache.cassandra.locator.SimpleSeedProvider
-      parameters:
-          # seeds is actually a comma-delimited list of addresses.
-          - seeds: "127.0.0.1"
+# Addresses of hosts that are deemed contact points.
+# Cassandra nodes use this list of hosts to find each other and learn
+# the topology of the ring.  You must change this if you are running
+# multiple nodes!
+seeds:
+    - 127.0.0.1
 
 # Access mode.  mmapped i/o is substantially faster, but only practical on
 # a 64bit machine (which notably does not include EC2 "small" instances)
@@ -292,23 +287,6 @@ request_scheduler: org.apache.cassandra.
 #  the index is at the cost of space.
 index_interval: 128
 
-# Enable or disable inter-node encryption
-# Default settings are TLS v1, RSA 1024-bit keys (it is imperative that
-# users generate their own keys) TLS_RSA_WITH_AES_128_CBC_SHA as the cipher
-# suite for authentication, key exchange and encryption of the actual data transfers.
-# NOTE: No custom encryption options are enabled at the moment
-# The available internode options are : all, none
-#
-# The passwords used in these options must match the passwords used when generating
-# the keystore and truststore.  For instructions on generating these files, see:
-# http://download.oracle.com/javase/6/docs/technotes/guides/security/jsse/JSSERefGuide.html#CreateKeystore
-encryption_options:
-    internode_encryption: none
-    keystore: conf/.keystore
-    keystore_password: cassandra
-    truststore: conf/.truststore
-    truststore_password: cassandra
-
 # Keyspaces have ColumnFamilies.        (Usually 1 KS per application.)
 # ColumnFamilies have Rows.             (Dozens of CFs per KS.)
 # Rows contain Columns.                 (Many per CF.)
@@ -338,7 +316,8 @@ encryption_options:
 #   With NetworkTopologyStrategy,
 #   for each datacenter, you can specify how many replicas you want
 #   on a per-keyspace basis.  Replicas are placed on different racks
-#   within each DC, if possible. 
+#   within each DC, if possible. This strategy also requires rack aware
+#   snitch, such as RackInferringSnitch or PropertyFileSnitch.
 #   An example:
 #    - name: Keyspace1
 #      replica_placement_strategy: org.apache.cassandra.locator.NetworkTopologyStrategy
@@ -481,10 +460,3 @@ keyspaces:
               validator_class: LongType
               index_name: birthdate_idx
               index_type: KEYS
-
-        - name: Counter1
-          default_validation_class: CounterColumnType
-
-        - name: SuperCounter1
-          column_type: Super
-          default_validation_class: CounterColumnType