Merge lp://staging/~cthier/swift/working into lp://staging/~hudson-openstack/swift/trunk
Proposed by
Chuck Thier
| Status: | Merged |
|---|---|
| Approved by: | John Dickinson |
| Approved revision: | 23 |
| Merged at revision: | 23 |
| Proposed branch: | lp://staging/~cthier/swift/working |
| Merge into: | lp://staging/~hudson-openstack/swift/trunk |
| Diff against target: |
284 lines (+32/-31) 9 files modified
.bzrignore (+1/-0) doc/source/development_saio.rst (+3/-3) setup.py (+1/-1) test/probe/common.py (+6/-6) test/probe/test_account_failures.py (+2/-2) test/probe/test_container_failures.py (+4/-4) test/probe/test_object_async_update.py (+2/-2) test/probe/test_object_handoff.py (+10/-10) test/probe/test_running_with_each_type_down.py (+3/-3) |
| To merge this branch: | bzr merge lp://staging/~cthier/swift/working |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Monty Taylor (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Modified probe tests to work with setup.py develop installs
Updated SAIO instructions to note that probe tests will reset your environment
Added the swift.egg-info directory to .bzrignore
Updated setup.py to correctly ignore the test directory when installing
Description of the change
Modified probe tests to work with setup.py develop installs
Updated SAIO instructions to note that probe tests will reset your environment
Added the swift.egg-info directory to .bzrignore
Updated setup.py to correctly ignore the test directory when installing
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
This all looks good.