tree 188caa9ad91bcfee589f3ba328c0bdd045982f2c
parent 3404b566922b175812c91c08e0e6f2a470bef7b9
author Simon Pasquier <spasquier@mirantis.com> 1494489821 +0200
committer Simon Pasquier <spasquier@mirantis.com> 1494601375 +0200

Merge swarm and monitoring classes (mcp11-k8s-*)

This avoids many problems when overriding parameters in the init
classes.

Change-Id: I71067f26c95e0e3807cd1eb94a6bb735f08df166