Merge lp://staging/~mbruzek/charms/trusty/kubernetes-master/trunk into lp://staging/~kubernetes/charms/trusty/kubernetes-master/trunk
Proposed by
Matt Bruzek
| Status: | Merged |
|---|---|
| Merged at revision: | 14 |
| Proposed branch: | lp://staging/~mbruzek/charms/trusty/kubernetes-master/trunk |
| Merge into: | lp://staging/~kubernetes/charms/trusty/kubernetes-master/trunk |
| Diff against target: |
979 lines (+383/-164) 16 files modified
Makefile (+2/-1) README.md (+42/-17) config.yaml (+24/-0) copyright (+1/-1) files/apiserver.upstart.tmpl (+8/-9) files/controller-manager.upstart.tmpl (+1/-8) files/distribution.conf.tmpl (+5/-1) files/nginx.conf.tmpl (+25/-37) files/scheduler.upstart.tmpl (+1/-8) hooks/__init__.py (+16/-0) hooks/hooks.py (+118/-26) hooks/install.py (+35/-10) hooks/kubernetes_installer.py (+17/-3) hooks/setup.py (+14/-0) unit_tests/kubernetes_installer_test.py (+25/-13) unit_tests/test_install.py (+49/-30) |
| To merge this branch: | bzr merge lp://staging/~mbruzek/charms/trusty/kubernetes-master/trunk |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Charles Butler (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Synched this charm with the content on github. Then ran the lint and CI tests against the code.
Had to clean up quite a few failures to get here, but this charm passes all tests in CI and is synchronized with the content in github.
http://
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
+1 lGTM
Thanks for the hard work Matt.