Merge lp://staging/~cthier/swift/admin_guide into lp://staging/~hudson-openstack/swift/trunk
Proposed by
Chuck Thier
Status: | Merged |
---|---|
Approved by: | John Dickinson |
Approved revision: | 48 |
Merge reported by: | OpenStack Infra |
Merged at revision: | not available |
Proposed branch: | lp://staging/~cthier/swift/admin_guide |
Merge into: | lp://staging/~hudson-openstack/swift/trunk |
Diff against target: |
381 lines (+261/-14) 8 files modified
.bzrignore (+1/-0) doc/source/admin_guide.rst (+154/-0) doc/source/deployment_guide.rst (+96/-1) doc/source/index.rst (+1/-0) etc/proxy-server.conf-sample (+0/-3) swift/account/reaper.py (+8/-4) swift/obj/replicator.py (+1/-1) swift/proxy/server.py (+0/-5) |
To merge this branch: | bzr merge lp://staging/~cthier/swift/admin_guide |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
John Dickinson | Approve | ||
Review via email: mp+31419@code.staging.launchpad.net |
Commit message
Added first stab of an administration guide, added a few items to the deployment guide, cleaned up a coupld of docstring warnings, and removed some unused config options in the proxy
Description of the change
Added first stab of an administration guide, added a few items to the deployment guide, cleaned up a coupld of docstring warnings, and removed some unused config options in the proxy
To post a comment you must log in.