← Back to branch summary

~lomov-as/charms/trusty/cloudfoundry-123/trunk

~lomov-as/charms/trusty/cloudfoundry-123/trunk

Viewing all changes in revision 119.

Committer: Benjamin Saller
Date: 2014-09-18 19:37:22 UTC
mfrom: (106.1.43 cloudfoundry)
Revision ID: benjamin.saller@canonical.com-20140918193722-4glzijy82vc1l9ag

merge trunk

files added:
charmgen/placements.yaml

files modified:
charmgen/generator.py

cloudfoundry/contexts.py

cloudfoundry/services.py

config.yaml

hooks/common.py

tests/test_contexts.py

tests/test_generator.py

Show diffs side-by-side

added added

removed removed

charmgen/generator.py

charmgen/placements.yaml

cloudfoundry/contexts.py

cloudfoundry/services.py

hooks/common.py

tests/test_contexts.py

tests/test_generator.py

Older »