fixed lbaas flag for azure

gardener-attic / kubify

Terraform Template to Setup a Kubernetes Cluster on OpenStack/AWS/Azure

Other

147 stars 31 forks source link

fixed lbaas flag for azure #44

Closed fsniper closed 6 years ago

afritzler commented 6 years ago

@fsniper sorry for the huge delay here. Can you resolve the merge conflicts please. (also for #42) Thx!

mandelsoft commented 6 years ago

I've done the fixes mentioned in the review comment above on the master branch. Then I tried to merge using the 'Update branch' button above. Github states, that everything is ok, but the merge commit does nothing than ignore my changes. Basically the state now is lying. You should set your changes on top of the master branch including the changes done there. I cannot do this.

mandelsoft commented 6 years ago

I've cleaned the history a little bit