lp://qastaging/~jacekn/charm-helpers/python-six-fix

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp://qastaging/charm-helpers

Stuart Bishop (community): Disapprove on 2015-12-08

Diff: 93 lines (+21/-12)

3 files modified

charmhelpers/core/host.py (+11/-2)
tests/contrib/charmsupport/test_nrpe.py (+9/-9)
tests/core/test_strutils.py (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

385. By Jacek Nykis on 2015-06-04

fix if logic bug

384. By Jacek Nykis on 2015-06-04

Import six module only if needed. Install python{,3}-six if needed

383. By Jacek Nykis on 2015-06-04

Fix nrpe and strutils tests

382. By Jorge Niedbalski on 2015-06-03

[niedbalski,r=freyes,billy-olsen,msplivalo] Fixes lp: #1461669

381. By Chris Glass on 2015-05-29

Merge lp:~free.ekanayaka/charm-helpers/relation-set-file. [a=free.ekayanaka] [r=tribaal]

This branch fixes the related bug and reintroduces the --file feature of relation-set.

380. By James Page on 2015-05-27

OpenStack deploy-from-source

* Default to shallow clone for git (depth=1)
* Add Python virtualenv support for pip installs
* Pass http_proxy to pip install if specified

379. By James Page on 2015-05-27

Reverting commit 373 due to regressions in hacluster charm relation.

378. By Liam Young on 2015-05-21

[hopem, r=gnuoy]
network-vlan-ranges parser needs to support physnet specified
without range.

Partially-Closes-Bug: #1451095

377. By James Page on 2015-05-20

Add basic hookenv support for leadership-election

376. By Tim Van Steenburgh on 2015-05-20

[johnsca] Fix issues with provide_data in services framework

  * Providing data is gated on data being complete, with no option for sending partial data (necessary for two-way communication)

  * Providing data is gated on current hook (no way to, e.g., send new data out in response to a config-changed hook)

  * Providing data happens before data_ready with no way of telling if data_ready was triggered

I also fixed an issue with update-revno where the generated version.py was failing lint.