← Back to branch summary

~bcsaller/charms/trusty/cloudfoundry/progressbar

~bcsaller/charms/trusty/cloudfoundry/progressbar

Viewing all changes in revision 156.

Committer: Benjamin Saller
Date: 2014-11-06 00:47:41 UTC
mfrom: (154.1.2 reconciler-integration)
Revision ID: benjamin.saller@canonical.com-20141106004741-6fyd10onis9dwvcv

merge ri shadow trunk

files modified:
cfdeploy

charmgen/generator.py

charmhelpers/core/services/base.py

charmhelpers/core/services/helpers.py

cloudfoundry/contexts.py

cloudfoundry/mapper.py

cloudfoundry/services.py

cloudfoundry/utils.py

reconciler/strategy.py

tests/test_jobs.py

Show diffs side-by-side

added added

removed removed

charmgen/generator.py

charmhelpers/core/services/base.py

charmhelpers/core/services/helpers.py

cloudfoundry/contexts.py

cloudfoundry/mapper.py

cloudfoundry/services.py

cloudfoundry/utils.py

reconciler/strategy.py

tests/test_jobs.py

Older »