lp:~kubernetes/charms/trusty/flannel-docker/trunk

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:charms/trusty/flannel-docker at revision 13

Tim Van Steenburgh (community): Approve on 2015-09-28

Diff: 11 lines (+1/-0)

1 file modified

tox.ini (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

11. By Charles Butler on 2015-09-28

Adds simplejson to tox dependency list

10. By Charles Butler on 2015-09-24

repoint etcd to charm-store resource

9. By Charles Butler on 2015-09-24

Update testplan w/ implicit make targets clean and lint

8. By Charles Butler on 2015-09-24

Adds testing config files and work-around for ansible exception behavior

7. By Charles Butler on 2015-09-22

    [r=mbruzek] Charles Butler 2015-09-22 Updates to v0.0.7 of flannel-docker charm
    Charles Butler 2015-09-22 import of v0.0.6 of flannel-docker charm
    Charles Butler 2015-07-20 Bump flannel docker package
    Matthew Bruzek 2015-07-17 Removed the space before the permissions in installorupgrade.yaml

Merged branch lp:~lazypower/charms/trusty/flannel-docker/patch_etcd_rest_script

6. By Charles Butler on 2015-09-16

  Charles Butler 2015-05-21 Release of v0.0.5 of the flannel-docker charm
    Charles Butler 2015-04-02 Update the tests to be a bit more CI compliant
    Charles Butler 2015-04-01 Update tests to reflect the order dependency exhibited in bug #14
    Charles Butler 2015-04-01 Scope the charm deploys to series/service pointing at the store. plan for success
    Charles Butler 2015-04-01 Correct the relationship sequence for the README if deploying by hand.
    Charles Butler 2015-04-01 V0.0.5 from github
    Charles Butler 2015-04-01 Import tag v0.0.4 from github

5. By Charles Butler on 2015-09-16

Updates to v0.0.6

4. By Charles Butler on 2015-03-23

Corrected unit tests, and validated the Makefile construction

3. By Charles Butler on 2015-01-22

Remove sudo package installation from Makefile target

2. By Charles Butler on 2015-01-22

Adds v0.0.2 - release notes here: https://github.com/chuckbutler/flannel-docker-charm/releases/tag/v0.0.2