openstack/deb-manila
Code Issues Proposed changes

Merge "Switch from MySQL-python to PyMySQL"

Browse Source
This commit is contained in:
Jenkins 2015-06-02 19:22:15 +00:00 committed by Gerrit Code Review
commit 5dca99a6e8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/adminref/quick_start.rst
View File

@ -219,7 +219,7 @@ Open Manila configuration file `/etc/manila/manila.conf`::
[DATABASE] [DATABASE]
# Set up MySQL connection. In following ‘foo’ is username, # Set up MySQL connection. In following ‘foo’ is username,
# ‘bar’ is password and ‘quuz’ is host name or address: # ‘bar’ is password and ‘quuz’ is host name or address:
connection = mysql://foo:bar@quuz/manila?charset=utf8 connection = mysql+pymysql://foo:bar@quuz/manila?charset=utf8
[oslo_concurrency] [oslo_concurrency]
# Following opt defines directory to be used for lock files creation. # Following opt defines directory to be used for lock files creation.

2
test-requirements.txt
View File

@ -11,7 +11,7 @@ ddt>=0.7.0
discover discover
fixtures>=0.3.14 fixtures>=0.3.14
mock>=1.0 mock>=1.0
MySQL-python PyMySQL>=0.6.2 # MIT License
oslotest>=1.5.1 # Apache-2.0 oslotest>=1.5.1 # Apache-2.0
oslosphinx>=2.5.0 # Apache-2.0 oslosphinx>=2.5.0 # Apache-2.0
psycopg2 psycopg2