aboutsummaryrefslogtreecommitdiffstats
path: root/charms/trusty/ceilometer-agent/.bzr/checkout/conflicts
AgeCommit message (Collapse)AuthorFilesLines
2017-03-23Deleted charms with wrong license. Will source them differently in future.Stuart Mackie1-1/+0
Change-Id: I0fc99ea03c6b6ca4701e63793cb2be60e56c7588 Signed-off-by: Stuart Mackie <wsmackie@juniper.net>
2016-10-07Charms for Contrail 3.1 with MitakaStuart Mackie1-0/+1
Change-Id: Id37f3b9743d1974e31fcd7cd9c54be41bb0c47fb Signed-off-by: Stuart Mackie <wsmackie@juniper.net>