Merge branch 'master' into bug/fix-invalid-annotations
authorPete Vander Giessen <petevg@gmail.com>
Tue, 7 Mar 2017 21:20:39 +0000 (15:20 -0600)
committerGitHub <noreply@github.com>
Tue, 7 Mar 2017 21:20:39 +0000 (15:20 -0600)
commit27dfe759bbb54ca7dc963c30f6c52406c456983a
treeae1ad33590c708d95d1ae89b0156bcd834aee5f6
parent63413d09a6fae28fd1fec1ea07bb10b368d561c9
parenta09dd5038d226fbcda54a79bdddc995054857198
Merge branch 'master' into bug/fix-invalid-annotations
juju/client/connection.py
juju/model.py