← Back to branch summary

~teknico/charm-helpers/lint-fixes

~teknico/charm-helpers/lint-fixes

Viewing all changes in revision 74.

Committer: Nicola Larosa
Date: 2013-09-02 08:01:04 UTC
mfrom: (72.1.4 charm-helpers)
Revision ID: nicola.larosa@canonical.com-20130902080104-0pd17ehu4y2xbxw1

Merge from trunk, one conflict resolved.

files added:
charmhelpers/contrib/ssl

charmhelpers/contrib/ssl/__init__.py

tests/contrib/ssl

tests/contrib/ssl/__init__.py

tests/contrib/ssl/test_ssl.py

files modified:
charmhelpers/contrib/openstack/utils.py

charmhelpers/core/host.py

charmhelpers/fetch/bzrurl.py

tests/core/test_host.py

Show diffs side-by-side

added added

removed removed

charmhelpers/contrib/openstack/utils.py

charmhelpers/contrib/ssl/

charmhelpers/contrib/ssl/__init__.py

charmhelpers/core/host.py

charmhelpers/fetch/bzrurl.py

tests/contrib/ssl/

tests/contrib/ssl/__init__.py

tests/contrib/ssl/test_ssl.py

tests/core/test_host.py

Older »