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

Proposed by Charles Butler on 2015-09-28
Status: Merged
Merged at revision: 13
Proposed branch: lp:~kubernetes/charms/trusty/flannel-docker/trunk
Merge into: lp:charms/trusty/flannel-docker
Diff against target: 11 lines (+1/-0)
1 file modified
tox.ini (+1/-0)
To merge this branch: bzr merge lp:~kubernetes/charms/trusty/flannel-docker/trunk
Reviewer Review Type Date Requested Status
Tim Van Steenburgh 2015-09-28 Approve on 2015-09-28
Review via email: mp+272612@code.launchpad.net
To post a comment you must log in.
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tox.ini'
2--- tox.ini 2015-09-24 12:47:59 +0000
3+++ tox.ini 2015-09-28 14:47:39 +0000
4@@ -27,6 +27,7 @@
5 flake8
6 charm-tools
7 ansible-lint
8+ simplejson
9
10 commands =
11 flake8 {toxinidir}/hooks

Subscribers

People subscribed via source and target branches

to all changes: