Merging from branch

This commit is contained in:
Chuck Thier 2010-08-20 15:32:40 +00:00
commit 85e043e9a2
2 changed files with 4 additions and 4 deletions

View File

@ -172,7 +172,7 @@ Option Default Description
------------------ ---------- ---------------------------------------------
use paste.deploy entrypoint for the object
server. For most cases, this should be
`egg:swfit#object`.
`egg:swift#object`.
log_requests True Weather or not to log each request
user swift User to run as
node_timeout 3 Request timeout to external services
@ -260,7 +260,7 @@ Option Default Description
------------------ ---------- --------------------------------------------
use paste.deploy entrypoint for the container
server. For most cases, this should be
`egg:swfit#container`.
`egg:swift#container`.
node_timeout 3 Request timeout to external services
conn_timeout 0.5 Connection timeout to external services
================== ========== ============================================
@ -337,7 +337,7 @@ Option Default Description
------------------ ---------- ---------------------------------------------
use paste.deploy entrypoint for the account
server. For most cases, this should be
`egg:swfit#account`.
`egg:swift#account`.
================== ========== =============================================
[account-replicator]

View File

@ -35,7 +35,7 @@ good idea what to do on other environments.
#. `apt-get install curl gcc bzr memcached python-configobj
python-coverage python-dev python-nose python-setuptools python-simplejson
python-xattr sqlite3 xfsprogs python-webob python-eventlet
python-greenlet`
python-greenlet python-pastedeploy`
#. Install anything else you want, like screen, ssh, vim, etc.
#. `fdisk /dev/sdb` (set up a single partition)
#. `mkfs.xfs -i size=1024 /dev/sdb1`