Merge lp://staging/~junaidali/charms/trusty/plumgrid-director/liberty into lp://staging/~plumgrid-team/charms/trusty/plumgrid-director/trunk
Proposed by
Junaid Ali
Status: | Merged |
---|---|
Merged at revision: | 31 |
Proposed branch: | lp://staging/~junaidali/charms/trusty/plumgrid-director/liberty |
Merge into: | lp://staging/~plumgrid-team/charms/trusty/plumgrid-director/trunk |
Diff against target: |
9987 lines (+7318/-603) 62 files modified
bin/charm_helpers_sync.py (+253/-0) hooks/charmhelpers/contrib/amulet/deployment.py (+4/-2) hooks/charmhelpers/contrib/amulet/utils.py (+382/-86) hooks/charmhelpers/contrib/charmsupport/nrpe.py (+52/-14) hooks/charmhelpers/contrib/hardening/__init__.py (+15/-0) hooks/charmhelpers/contrib/hardening/apache/__init__.py (+19/-0) hooks/charmhelpers/contrib/hardening/apache/checks/__init__.py (+31/-0) hooks/charmhelpers/contrib/hardening/apache/checks/config.py (+100/-0) hooks/charmhelpers/contrib/hardening/audits/__init__.py (+63/-0) hooks/charmhelpers/contrib/hardening/audits/apache.py (+100/-0) hooks/charmhelpers/contrib/hardening/audits/apt.py (+105/-0) hooks/charmhelpers/contrib/hardening/audits/file.py (+552/-0) hooks/charmhelpers/contrib/hardening/harden.py (+84/-0) hooks/charmhelpers/contrib/hardening/host/__init__.py (+19/-0) hooks/charmhelpers/contrib/hardening/host/checks/__init__.py (+50/-0) hooks/charmhelpers/contrib/hardening/host/checks/apt.py (+39/-0) hooks/charmhelpers/contrib/hardening/host/checks/limits.py (+55/-0) hooks/charmhelpers/contrib/hardening/host/checks/login.py (+67/-0) hooks/charmhelpers/contrib/hardening/host/checks/minimize_access.py (+52/-0) hooks/charmhelpers/contrib/hardening/host/checks/pam.py (+134/-0) hooks/charmhelpers/contrib/hardening/host/checks/profile.py (+45/-0) hooks/charmhelpers/contrib/hardening/host/checks/securetty.py (+39/-0) hooks/charmhelpers/contrib/hardening/host/checks/suid_sgid.py (+131/-0) hooks/charmhelpers/contrib/hardening/host/checks/sysctl.py (+211/-0) hooks/charmhelpers/contrib/hardening/mysql/__init__.py (+19/-0) hooks/charmhelpers/contrib/hardening/mysql/checks/__init__.py (+31/-0) hooks/charmhelpers/contrib/hardening/mysql/checks/config.py (+89/-0) hooks/charmhelpers/contrib/hardening/ssh/__init__.py (+19/-0) hooks/charmhelpers/contrib/hardening/ssh/checks/__init__.py (+31/-0) hooks/charmhelpers/contrib/hardening/ssh/checks/config.py (+394/-0) hooks/charmhelpers/contrib/hardening/templating.py (+71/-0) hooks/charmhelpers/contrib/hardening/utils.py (+157/-0) hooks/charmhelpers/contrib/mellanox/infiniband.py (+151/-0) hooks/charmhelpers/contrib/network/ip.py (+55/-23) hooks/charmhelpers/contrib/network/ovs/__init__.py (+6/-2) hooks/charmhelpers/contrib/network/ufw.py (+5/-6) hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+135/-14) hooks/charmhelpers/contrib/openstack/amulet/utils.py (+421/-13) hooks/charmhelpers/contrib/openstack/context.py (+318/-79) hooks/charmhelpers/contrib/openstack/ip.py (+35/-7) hooks/charmhelpers/contrib/openstack/neutron.py (+62/-21) hooks/charmhelpers/contrib/openstack/templating.py (+30/-2) hooks/charmhelpers/contrib/openstack/utils.py (+939/-70) hooks/charmhelpers/contrib/peerstorage/__init__.py (+5/-4) hooks/charmhelpers/contrib/python/packages.py (+35/-11) hooks/charmhelpers/contrib/storage/linux/ceph.py (+823/-61) hooks/charmhelpers/contrib/storage/linux/loopback.py (+10/-0) hooks/charmhelpers/contrib/storage/linux/utils.py (+8/-7) hooks/charmhelpers/contrib/templating/jinja.py (+4/-3) hooks/charmhelpers/core/hookenv.py (+220/-13) hooks/charmhelpers/core/host.py (+298/-75) hooks/charmhelpers/core/hugepage.py (+71/-0) hooks/charmhelpers/core/kernel.py (+68/-0) hooks/charmhelpers/core/services/helpers.py (+30/-5) hooks/charmhelpers/core/strutils.py (+30/-0) hooks/charmhelpers/core/templating.py (+21/-8) hooks/charmhelpers/core/unitdata.py (+61/-17) hooks/charmhelpers/fetch/__init__.py (+18/-2) hooks/charmhelpers/fetch/archiveurl.py (+1/-1) hooks/charmhelpers/fetch/bzrurl.py (+22/-32) hooks/charmhelpers/fetch/giturl.py (+20/-23) hooks/pg_dir_hooks.py (+3/-2) |
To merge this branch: | bzr merge lp://staging/~junaidali/charms/trusty/plumgrid-director/liberty |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Bilal Baqar | Approve | ||
Review via email: mp+292151@code.staging.launchpad.net |
To post a comment you must log in.