Merge lp://qastaging/~james-page/charms/trusty/ceph-osd/tox into lp://qastaging/~openstack-charmers-archive/charms/trusty/ceph-osd/next

Proposed by James Page
Status: Merged
Merged at revision: 53
Proposed branch: lp://qastaging/~james-page/charms/trusty/ceph-osd/tox
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/ceph-osd/next
Diff against target: 109 lines (+61/-3)
6 files modified
.bzrignore (+2/-0)
.testr.conf (+8/-0)
hooks/ceph_hooks.py (+3/-3)
requirements.txt (+11/-0)
test-requirements.txt (+8/-0)
tox.ini (+29/-0)
To merge this branch: bzr merge lp://qastaging/~james-page/charms/trusty/ceph-osd/tox
Reviewer Review Type Date Requested Status
Corey Bryant (community) Approve
Review via email: mp+276206@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #12912 ceph-osd-next for james-page mp276206
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/12912/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #11988 ceph-osd-next for james-page mp276206
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/11988/

55. By James Page

Make things alot simpler

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #12914 ceph-osd-next for james-page mp276206
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/12914/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #11990 ceph-osd-next for james-page mp276206
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/11990/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #7655 ceph-osd-next for james-page mp276206
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/7655/

56. By James Page

resync requirements with openstack upstream

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #7657 ceph-osd-next for james-page mp276206
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/7657/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #11995 ceph-osd-next for james-page mp276206
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/11995/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #12921 ceph-osd-next for james-page mp276206
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/12921/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #7663 ceph-osd-next for james-page mp276206
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/7663/

Revision history for this message
Corey Bryant (corey.bryant) wrote :

Code looks good, I just want to run tests before landing.

Revision history for this message
Corey Bryant (corey.bryant) wrote :

Tox tests run successfully for me. Merging.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches