Merge lp://qastaging/~mbruzek/charms/trusty/kubernetes-master/v1.0.0 into lp://qastaging/~kubernetes/charms/trusty/kubernetes-master/trunk
Proposed by
Matt Bruzek
| Status: | Merged |
|---|---|
| Merged at revision: | 9 |
| Proposed branch: | lp://qastaging/~mbruzek/charms/trusty/kubernetes-master/v1.0.0 |
| Merge into: | lp://qastaging/~kubernetes/charms/trusty/kubernetes-master/trunk |
| Diff against target: |
631 lines (+86/-370) 17 files modified
cli.txt (+0/-80) config.yaml (+1/-1) copyright (+7/-7) docs/1-getting-started.md (+0/-81) docs/contributing.md (+0/-52) files/apiserver.upstart.tmpl (+1/-1) files/create_kubernetes_tar.sh (+0/-59) files/distribution.conf.tmpl (+1/-1) hooks/__init__.py (+2/-0) hooks/hooks.py (+61/-38) hooks/install.py (+2/-1) hooks/kubernetes_installer.py (+2/-0) hooks/setup.py (+2/-0) metadata.yaml (+3/-1) scripts/guestbook.sh (+0/-48) unit_tests/kubernetes_installer_test.py (+2/-0) unit_tests/test_install.py (+2/-0) |
| To merge this branch: | bzr merge lp://qastaging/~mbruzek/charms/trusty/kubernetes-master/v1.0.0 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Charles Butler (community) | Approve | ||
|
Review via email:
|
|||
To post a comment you must log in.
Revision history for this message
| Matt Bruzek (mbruzek) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Vendoring the changes for the v1.0.0 kubernetes release