github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #22726 from chuckbutler/juju-import-layers

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-03-23 14:26:42 -07:00
parent f4b948bc0f cc1fb15ef7
commit 69b3cb36a6
70 changed files with 801 additions and 2513 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -88,6 +88,9 @@ doc_tmp/
# CoreOS stuff
cluster/libvirt-coreos/coreos_*.img
# Juju Stuff
cluster/juju/charms/*
# Downloaded Kubernetes binary release
kubernetes/