Code

Implement merging strategy#77

Code

Closed

thetechnick wants to merge 6 commits intonginx:masternginx/kubernetes-ingress:masterfrom thetechnick:ingress-mergingthetechnick/kubernetes-ingress:ingress-mergingCopy head branch name to clipboard

+741-88

Commits

Commits on Dec 3, 2016

• Refactored IngressNginxConfig to contain only one server

  

  Nico Schieder

  committed
  11a157a

  Copy full SHA for 11a157a

• Removed IngressNginxConfig

  

  Nico Schieder

  committed
  f210ac0

  Copy full SHA for f210ac0

• Rebased to include changes of branch single-server-per-file

  

  Nico Schieder

  committed
  d303109

  Copy full SHA for d303109

Commits on Dec 7, 2016

• Rewrite of mergers to collision handlers

  

  Nico Schieder

  committed
  ff40883

  Copy full SHA for ff40883

Commits on Dec 9, 2016

• Fix map nil pointer error and wrong keys in template

  

  Nico Schieder

  committed
  997d27f

  Copy full SHA for 997d27f

• Fixed default backend filename

  

  Nico Schieder

  committed
  ec1d0cb

  Copy full SHA for ec1d0cb