lp:~openstack-charmers-next/charms/trusty/cinder/trunk

Branch merges

Propose for merging

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

179. By James Page on 2016-07-07

Resync charmhelpers

Due to the way that changes get merged in git/gerrit, a number of
charm-helpers changes from a previous sync where lost when an
older review was landed, which referred to an older charmhelpers
version.

Resync and fix missing bits.

Change-Id: I37c3b129b302ad02f3b1820db2076a8de28cb28c

178. By Jenkins <email address hidden> on 2016-07-07

Merge "Sync charm helpers and drop icehouse default"

177. By James Page on 2016-07-06

Resync charmhelpers for licensing change

The charm-helpers project have re-licensed to Apache 2.0
inline with the agreed licensing approach to intefaces,
layers and charms generally.

Resync helpers to bring charmhelpers inline with charm
codebase.

Change-Id: I5bce377d4fc9e5ff3be8280cf08a7abc911d347c

176. By Jenkins <email address hidden> on 2016-07-01

Merge "Re-license charm as Apache-2.0"

175. By Corey Bryant on 2016-06-23

Sync charm-helpers for openstack-origin-git defaults.

Change-Id: Ibe23b945c99373f1dd82c887190a917bd64238f6

174. By Jenkins <email address hidden> on 2016-06-23

Merge "DNS HA"

173. By James Page on 2016-06-17

Switch to using charm-store for amulet tests

All OpenStack charms are now directly published to the charm store
on landing; switch Amulet helper to resolve charms using the
charm store rather than bzr branches, removing the lag between
charm changes landing and being available for other charms to
use for testing.

This is also important for new layered charms where the charm must
be build and published prior to being consumable.

Change-Id: Ia3b04c0ea4576ef50e3bc88de366738ba645a0ff

172. By Alex Kavanagh on 2016-06-15

Fix for multiple status-set - related to bug 1588462

This change fixes the obvious race for a status_set() between
check_optional_interfaces() and assess_status() as the later calls the former
which calls status_set(), returns the status, which is then potentially set
again by the assess_status() function. This cleans up the code so that only a
single status_set() is performed when calling assess_status().

Change-Id: I3604ed3b36af91afb95d43e0e5e24483c9919fd1
Related-Bug:#1588462

171. By Jenkins <email address hidden> on 2016-06-09

Merge "Add defaults for openstack-origin-git config option"

170. By James Page on 2016-05-27

Resync charm helpers

Add support for OpenStack Newton and Ocata.

Rework version detection code to just match on major version for
OpenStack projects using semantic versioning.

Provide fallback version detection based on major.minor versions
for swift packages.

Rework config-flags support helpers.

Fix is_ip function to correctly detect both IPv4 and IPv6 addresses.

Change-Id: Ifed0c7a742291bbc6380143be0f8b743c5b918f3