tree 31a7b2a726b90f2a39d60f119c860d94f5d8fcbc
parent 114adfc2bfe1e7a769aa4f54162602a069911b23
parent 8135d86be480077d9ee1a67030ba1b7986905b9d
author Ondrej Smola <osmola@mirantis.com> 1522938888 +0000
committer Gerrit Code Review <gerrit2@7e698601da6d> 1522938888 +0000

Merge "Fix cniVersion for non-genie deployments."