Merge from -next

This commit is contained in:
Adam Collard
2015-08-06 11:48:37 +01:00
31 changed files with 2225 additions and 356 deletions

View File

@@ -2,6 +2,7 @@ branch: lp:charm-helpers
destination: charmhelpers
include:
- core
- cli
- contrib.openstack|inc=*
- contrib.storage
- fetch