Juju Charms Collection
ceph package

Merge lp://staging/~xfactor973/charms/trusty/ceph/erasure-wip into lp://staging/~openstack-charmers-archive/charms/trusty/ceph/next

  1. Trusty Tahr (14.04)
  2. erasure-wip
  3. Merge into next
Proposed by James Page
Status: Needs review
Proposed branch: lp://staging/~xfactor973/charms/trusty/ceph/erasure-wip
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/ceph/next
Diff against target: 2003 lines (+1491/-86) (has conflicts)
22 files modified
.bzrignore (+1/-0)
actions.yaml (+128/-0)
charm-helpers-hooks.yaml (+1/-1)
charm-helpers-tests.yaml (+1/-1)
config.yaml (+22/-0)
hooks/ceph_broker.py (+4/-1)
hooks/charmhelpers/cli/__init__.py (+195/-0)
hooks/charmhelpers/cli/benchmark.py (+36/-0)
hooks/charmhelpers/cli/commands.py (+32/-0)
hooks/charmhelpers/cli/host.py (+31/-0)
hooks/charmhelpers/cli/unitdata.py (+39/-0)
hooks/charmhelpers/contrib/storage/linux/ceph.py (+135/-24)
hooks/charmhelpers/core/files.py (+45/-0)
hooks/charmhelpers/core/hookenv.py (+266/-27)
hooks/charmhelpers/core/host.py (+63/-30)
hooks/charmhelpers/core/services/helpers.py (+8/-0)
metadata.yaml (+1/-1)
tests/basic_deployment.py (+1/-1)
tests/charmhelpers/contrib/amulet/utils.py (+189/-0)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+6/-0)
tests/charmhelpers/contrib/openstack/amulet/utils.py (+269/-0)
tests/tests.yaml (+18/-0)
Conflict adding file hooks/charmhelpers/cli.  Moved existing file to hooks/charmhelpers/cli.moved.
Text conflict in hooks/charmhelpers/contrib/storage/linux/ceph.py
Conflict adding file hooks/charmhelpers/core/files.py.  Moved existing file to hooks/charmhelpers/core/files.py.moved.
Text conflict in hooks/charmhelpers/core/hookenv.py
Text conflict in hooks/charmhelpers/core/host.py
Text conflict in hooks/charmhelpers/core/services/helpers.py
Text conflict in tests/charmhelpers/contrib/amulet/utils.py
Text conflict in tests/charmhelpers/contrib/openstack/amulet/deployment.py
Text conflict in tests/charmhelpers/contrib/openstack/amulet/utils.py
Conflict adding file tests/tests.yaml.  Moved existing file to tests/tests.yaml.moved.
To merge this branch: bzr merge lp://staging/~xfactor973/charms/trusty/ceph/erasure-wip
Reviewer Review Type Date Requested Status
Edward Hope-Morley Needs Fixing
Review via email: mp+270983@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #9157 ceph-next for james-page mp270983
    UNIT FAIL: unit-test failed

UNIT Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full unit test output: http://paste.ubuntu.com/12409460/
Build: http://10.245.162.77:8080/job/charm_unit_test/9157/

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

charm_lint_check #9938 ceph-next for james-page mp270983
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/12409461/
Build: http://10.245.162.77:8080/job/charm_lint_check/9938/

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

charm_amulet_test #6422 ceph-next for james-page mp270983
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/12410066/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6422/

Reply
Revision history for this message
Edward Hope-Morley (hopem) wrote :

Hi Chris, not sure why but you have a lot of merge conflicts here (as well as lint unit and amulet fails which may be a consequence). Can you have a go at resyncing with /next?

review: Needs Fixing
Reply
Revision history for this message
Chris Holcombe (xfactor973) wrote :

I was actually just looking for feedback about my code. I wanted to know if the approach to the API looked ok. I'm not sure why it's being merged. There was probably some miscommunication.

Reply
Revision history for this message
Edward Hope-Morley (hopem) wrote :

Ack, well in any case it would be easier to read without the conflicts.

Reply

Unmerged revisions

111. By Chris Holcombe

Actions associated with the pool commands

110. By Chris Holcombe

WIP for erasure coding support

109. By Corey Bryant

[beisner,r=corey.bryant] Point charmhelper sync and amulet tests at stable branches.

108. By James Page

[gnuoy] 15.07 Charm release

107. By Liam Young

Point charmhelper sync and amulet tests at stable branches

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