Viewing all changes in revision 83.
- Committer: Hui Xiang
- Date: 2014-09-22 08:51:15 UTC
- mfrom: (77.2.4 ceph-226509)
- Revision ID: hui.xiang@canonical.com-20140922085115-zk23xe8o64am3a28
Merge from /next and fix conflicts.
- files added:
- charm-helpers-hooks.yaml
- hooks/charmhelpers/core/services
- tests
- tests/charmhelpers
- tests/charmhelpers/contrib
- tests/charmhelpers/contrib/amulet
- tests/charmhelpers/contrib/openstack
- tests/charmhelpers/contrib/openstack/amulet
- files removed:
- charm-helpers-sync.yaml
- hooks/charmhelpers/core/services
- files modified:
- Makefile
expand all
collapse all
added
removed
