Merge lp:~gholt/swift/docmultswauthupdate into lp:~hudson-openstack/swift/trunk

Proposed by gholt
Status: Merged
Merge reported by: gholt
Merged at revision: not available
Proposed branch: lp:~gholt/swift/docmultswauthupdate
Merge into: lp:~hudson-openstack/swift/trunk
Diff against target: 0 lines
To merge this branch: bzr merge lp:~gholt/swift/docmultswauthupdate
Reviewer Review Type Date Requested Status
Chuck Thier (community) Approve
Review via email: mp+53090@code.launchpad.net

Description of the change

Updated multi server docs re: swauth

To post a comment you must log in.
Revision history for this message
Chuck Thier (cthier) wrote :

Looks good

review: Approve
Revision history for this message
OpenStack Infra (hudson-openstack) wrote :

Attempt to merge into lp:swift failed due to conflicts:

text conflict in doc/source/howto_installmultinode.rst

lp:~gholt/swift/docmultswauthupdate updated
242. By gholt

Merged from trunk; Fixed conflict

Preview Diff

Empty