Merge lp:~lazypower/charms/trusty/flannel-docker/fixup-modeset-on-flannel into lp:~kubernetes/charms/trusty/flannel-docker/trunk

[Charles Butler]

Unmerged revisions

11. By Charles Butler on 2015-05-21

Release of v0.0.5 of the flannel-docker charm

Release notes here: https://github.com/chuckbutler/flannel-docker-charm/releases/tag/v0.0.5

10. By Charles Butler on 2015-04-02

Update the tests to be a bit more CI compliant

9. By Charles Butler on 2015-04-01

Update tests to reflect the order dependency exhibited in bug #14

8. By Charles Butler on 2015-04-01

Scope the charm deploys to series/service pointing at the store. plan for success

7. By Charles Butler on 2015-04-01

Correct the relationship sequence for the README if deploying by hand.

Adding relationship to the DB after Network will cause a silent and consistent
failure scenario. This is due to the guarding of the networking being setup,
and how ansible handles skip cases.

This is a logic error and is filed against bug #14 on the proejct:
https://github.com/chuckbutler/flannel-docker-charm/issues/14

6. By Charles Butler on 2015-04-01

V0.0.5 from github

5. By Charles Butler on 2015-04-01

Import tag v0.0.4 from github