Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: puppetlabs/puppetlabs-kubernetes
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.1.4
Choose a base ref
...
head repository: puppetlabs/puppetlabs-kubernetes
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0.2.0
Choose a head ref
  • 19 commits
  • 25 files changed
  • 5 contributors

Commits on Nov 28, 2017

  1. (fix for jenkins error)

    @sheenaajay
    sheenaajay committed Nov 28, 2017
    Configuration menu
    Copy the full SHA
    81c8e33 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #27 from sheenaajay/stickk8 

    k8_jenkins
    @davejrt
    davejrt authored Nov 28, 2017
    Configuration menu
    Copy the full SHA
    61a7879 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2017

  1. (CLOUD-1593) fix acceptance test on vagrant k8

    @sheenaajay
    sheenaajay committed Dec 4, 2017
    Configuration menu
    Copy the full SHA
    83e0996 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #28 from sheenaajay/k8vagrantfix 

    (CLOUD-1593) fix acceptance test on vagrant k8
    @davejrt
    davejrt authored Dec 4, 2017
    Configuration menu
    Copy the full SHA
    c450164 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2017

  1. first commit to add cri-containerd 

    final commit for cri_containerd
    scott coulton committed Dec 11, 2017
    Configuration menu
    Copy the full SHA
    d37ac1d View commit details
    Browse the repository at this point in the history

  2. final commit for cri-containerd

    scott coulton committed Dec 11, 2017
    Configuration menu
    Copy the full SHA
    85c1cea View commit details
    Browse the repository at this point in the history

  3. Update README.md 

    fixed typo in README
    @scotty-c
    scotty-c authored Dec 11, 2017
    Configuration menu
    Copy the full SHA
    3039189 View commit details
    Browse the repository at this point in the history

  4. (CLOUD-1614) Fix acceptance tests to run on centos (#30)

    @sheenaajay @scotty-c
    sheenaajay authored and scotty-c committed Dec 11, 2017
    Configuration menu
    Copy the full SHA
    9ab0142 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2017

  1. Update params.pp

    @scotty-c
    scotty-c authored Dec 14, 2017
    Configuration menu
    Copy the full SHA
    e800bbf View commit details
    Browse the repository at this point in the history

  2. Update params.pp

    @scotty-c
    scotty-c authored Dec 14, 2017
    Configuration menu
    Copy the full SHA
    6bef8a3 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2017

  1. ensuring files are created before kubelet is started

    Dave Try committed Dec 18, 2017
    Configuration menu
    Copy the full SHA
    fc5b6b4 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2017

  1. fixing acceptance tests

    Dave Try committed Dec 19, 2017
    Configuration menu
    Copy the full SHA
    8ef5484 View commit details
    Browse the repository at this point in the history

  2. updates for beta containerd on kube 1.9

    Dave Try committed Dec 19, 2017
    Configuration menu
    Copy the full SHA
    d0492d2 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into cri-containerd-dave

    @davejrt
    davejrt authored Dec 19, 2017
    Configuration menu
    Copy the full SHA
    e25144e View commit details
    Browse the repository at this point in the history

  4. Update metadata.json

    @davejrt
    davejrt authored Dec 19, 2017
    Configuration menu
    Copy the full SHA
    2e05cac View commit details
    Browse the repository at this point in the history

  5. Update .fixtures.yml

    @davejrt
    davejrt authored Dec 19, 2017
    Configuration menu
    Copy the full SHA
    b1467bf View commit details
    Browse the repository at this point in the history

  6. Merge pull request #31 from puppetlabs/cri-containerd-dave 

    * first commit to add cri-containerd

final commit for cri_containerd

* final commit for cri-containerd

* Update README.md

fixed typo in README

* Update params.pp

* Update params.pp

* ensuring files are created before kubelet is started

* fixing acceptance tests

* updates for beta containerd on kube 1.9

* Update metadata.json

* Update .fixtures.yml
    @scotty-c
    scotty-c authored Dec 19, 2017
    Configuration menu
    Copy the full SHA
    a91a45b View commit details
    Browse the repository at this point in the history

  7. updating metadata.json and changelog

    Dave Try committed Dec 19, 2017
    Configuration menu
    Copy the full SHA
    cb4b219 View commit details
    Browse the repository at this point in the history

  8. adding in params to README

    Dave Try committed Dec 19, 2017
    Configuration menu
    Copy the full SHA
    ef75871 View commit details
    Browse the repository at this point in the history
Loading