Merge "Fix Dispersion report and swift-bench on saio"

openstack/swift

Code Issues Proposed changes

Browse Source

This commit is contained in:

Jenkins

2012年07月17日 06:33:59 +00:00

committed by Gerrit Code Review

parent de4d23c2a5 5f72a8db4a

commit a5242dbe2c

3 changed files with 4 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

4
bin/swift-bench

View File

@@ -50,7 +50,7 @@ CONF_DEFAULTS = {

}

SAIO_DEFAULTS = {

'auth': 'http://saio:11000/v1.0',

'auth': 'http://localhost:8080/auth/v1.0',

'user': 'test:tester',

'key': 'testing',

}

@@ -60,7 +60,7 @@ if __name__ == '__main__':

usage += """\n\nConf file with SAIO defaults:

[bench]

auth = http://saio:11000/v1.0

auth = http://localhost:8080/v1.0

user = test:tester

key = testing

concurrency = 10

2
doc/source/admin_guide.rst

View File

@@ -180,7 +180,7 @@ swift-dispersion-populate and swift-dispersion-report use the same

configuration file, /etc/swift/dispersion.conf. Example conf file::

[dispersion]

auth_url = http://saio:11000/auth/v1.0

auth_url = http://localhost:8080/auth/v1.0

auth_user = test:tester

auth_key = testing

2
etc/dispersion.conf-sample

View File

@@ -1,5 +1,5 @@

[dispersion]

auth_url = http://saio:8080/auth/v1.0

auth_url = http://localhost:8080/auth/v1.0

auth_user = test:tester

auth_key = testing

# auth_url = http://saio:5000/v2.0/