« back to all changes in this revision
Viewing changes to Makefile
- Committer: Brad Crittenden
- Date: 2016-02-17 20:33:55 UTC
- mfrom: (63.1.11 openstack-dashboard)
- Revision ID: bac@canonical.com-20160217203355-uay92et202ll924c
Merge from upstream
- files added:
- actions/openstack-upgrade
- hooks/charmhelpers/cli
- hooks/dashboard-plugin-relation-changed
- hooks/dashboard-plugin-relation-joined
- hooks/identity-service-relation-departed
- hooks/install.real
- tests/setup
- files renamed:
- actions/openstack-upgrade@ => actions/openstack-upgrade.moved@
- actions/openstack_upgrade.py => actions/openstack_upgrade.py.moved
- hooks/charmhelpers/cli/ => hooks/charmhelpers/cli.moved/
- hooks/charmhelpers/core/files.py => hooks/charmhelpers/core/files.py.moved
- hooks/charmhelpers/core/hugepage.py => hooks/charmhelpers/core/hugepage.py.moved
- hooks/dashboard-plugin-relation-changed@ => hooks/dashboard-plugin-relation-changed.moved@
- hooks/dashboard-plugin-relation-joined@ => hooks/dashboard-plugin-relation-joined.moved@
- hooks/install.real@ => hooks/install.real.moved@
- tests/052-basic-trusty-kilo-git => tests/052-basic-trusty-kilo-git.moved
- tests/tests.yaml => tests/tests.yaml.moved
- unit_tests/test_actions_openstack_upgrade.py => unit_tests/test_actions_openstack_upgrade.py.moved
- files modified:
- Makefile
added
removed
Makefile
