search

chris-short / rak8s

Stand up a Raspberry Pi based Kubernetes cluster with Ansible
MIT License
365 stars 112 forks source link

Brings develop in line with master and resolves the conflict. #60

Closed gargoyle closed 4 years ago

gargoyle commented 4 years ago

The develop branch is currently 43 commits behind master (and 1 ahead). This brings it up-to date with master and resolves the conflict.

I think this will also negate the need to merge #59