← Back to branch summary

~bbaqar/charms/trusty/plumgrid-director/conflicts

~bbaqar/charms/trusty/plumgrid-director/conflicts

Viewing all changes in revision 18.

Committer: Bilal Baqar
Date: 2016-03-03 20:56:40 UTC
mfrom: (16.1.9 plumgrid-director-trunk)
Revision ID: bbaqar@plumgrid.com-20160303205640-06v279k1yya3dq0q

Resolved conflicts

files added:
tests/files/plumgrid-director-dense.yaml

tests/test.yaml

files removed:
tests/files/plumgrid-director-dense.yaml

tests/test.yaml

files modified:
Makefile

config.yaml

hooks/charmhelpers/contrib/openstack/neutron.py

hooks/pg_dir_context.py

hooks/pg_dir_hooks.py

hooks/pg_dir_utils.py

templates/kilo/ifcs.conf

templates/kilo/nginx.conf

unit_tests/test_pg_dir_context.py

unit_tests/test_pg_dir_hooks.py

Show diffs side-by-side

added added

removed removed

hooks/charmhelpers/contrib/openstack/neutron.py

hooks/pg_dir_context.py

hooks/pg_dir_hooks.py

hooks/pg_dir_utils.py

templates/kilo/ifcs.conf

templates/kilo/nginx.conf

tests/files/plumgrid-director-dense.yaml

tests/files/plumgrid-director-dense.yaml

tests/test.yaml

tests/test.yaml

unit_tests/test_pg_dir_context.py

unit_tests/test_pg_dir_hooks.py

Older »