lp://qastaging/~james-page/charms/trusty/midonet-agent/trunk

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/~celebdor/charms/trusty/midonet-agent/trunk at revision 33

Antoni Segura Puimedon: Pending requested 2016-02-15

Diff: 169 lines (+29/-46)

7 files modified

hooks/install (+12/-8)
tests/006-minimal-trusty-kilo-mem.py (+1/-1)
tests/010-basic-trusty-juno (+1/-1)
tests/011-basic-trusty-kilo (+1/-1)
tests/012-basic-trusty-liberty (+1/-1)
tests/basic_deployment.py (+11/-18)
unit_tests/test_context.py (+2/-16)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

33. By James Page on 2016-02-15

Fixup amulet test configuration

32. By James Page on 2016-02-12

Make tests compatible with use in virtualenvs

31. By James Page on 2016-02-12

Use midonet-origin with midonet-api as well

30. By James Page on 2016-02-12

My fixes

29. By Antoni Segura Puimedon <email address hidden> on 2016-02-11

Remove old amulet tests

28. By Antoni Segura Puimedon <email address hidden> on 2016-02-11

fix unit tests

27. By Antoni Segura Puimedon <email address hidden> on 2016-02-06

host-relation: add missing parameter to first config reading

26. By Antoni Segura Puimedon <email address hidden> on 2016-02-05

sync dependencies to get the new PuppetCallback

25. By Antoni Segura Puimedon <email address hidden> on 2016-02-05

puppet midonet ordering workaround and improved logging

24. By Antoni Segura Puimedon <email address hidden> on 2016-02-05

fix java properties parsing

ConfigParser needs files to have a header, so we wrap the files with
a file-like object that prepends a header