Skip to content

Commit

Permalink
Update comments to match tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
mcolyer committed Jun 1, 2012
1 parent 3435f0c commit 618e0f4
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
22 changes: 11 additions & 11 deletions bin/options.js
Expand Up @@ -12,10 +12,10 @@ module.exports = {
// all documents are deleted when the server restarts.

// By default, sharejs tries to use the redis DB backend.
type: 'redis',
//type: 'redis',

// The prefix for database entries
prefix: 'ShareJS:',
//prefix: 'ShareJS:',

// The hostname, port and options to pass to redis.
// null lets the database decide - redis by default connects to localhost port 6379.
Expand All @@ -32,7 +32,7 @@ module.exports = {

// To use postgresql uncomment this section then run bin/setup_pg
//type: 'pg',
//uri: 'tcp://josephg:@localhost/postgres',
//uri: 'tcp://binder:@localhost/postgres',

// By default, sharejs will create its tables in a schema called 'sharejs'.
//schema: 'sharejs',
Expand All @@ -44,13 +44,13 @@ module.exports = {
//create_tables_automatically: true,

// To use amazon uncomment this section then run bin/setup_amazon
//type: 'amazon',
//amazon_region: 'us-east-1',
//amazon_access_key: '',
//amazon_secret_key: '',
//amazon_s3_snapshots_bucket_name: '',
//amazon_dynamo_snapshots_table_name: '',
//amazon_dynamo_operations_table_name: '',
type: 'amazon',
amazon_region: 'us-east-1',
amazon_access_key: 'AKIAIOLJX35Q66PHICQQ',
amazon_secret_key: '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',
amazon_s3_snapshots_bucket_name: 'easel-development-snapshots',
amazon_dynamo_snapshots_table_name: 'easel-development-snapshots',
amazon_dynamo_operations_table_name: 'easel-development-operations',
},

// The server will statically host webclient/ directory at /share/*.
Expand Down
4 changes: 2 additions & 2 deletions src/server/db/amazon.coffee
Expand Up @@ -403,8 +403,8 @@ module.exports = AmazonDb = (options) ->
# Public: Get all operations between start and end noninclusive.
#
# docName - Name of the document
# start - The noninclusive starting version, must be less than end.
# end - The noninclusive ending version, if null assumed to be maximum
# start - The inclusive starting version, must be less than end.
# end - The noninclusive ending version. If null, assumed to be maximum
# value.
#
# Calls callback(error) on failure.
Expand Down

0 comments on commit 618e0f4

Please sign in to comment.