Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add LoadBalancerSourceRange to ingress Spec #148

Merged
merged 7 commits into from Jun 7, 2017
Merged

Add LoadBalancerSourceRange to ingress Spec #148

merged 7 commits into from Jun 7, 2017

Commits on Jun 5, 2017

  1. add accept-proxy annotations

    sadlil committed Jun 5, 2017
    Copy the full SHA
    5b37169 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    9f49290 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    307d992 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2017

  1. Merge remote-tracking branch 'origin/master'

    Conflicts:
    	pkg/controller/ingress/handler.go
    	pkg/controller/ingress/types.go
    sadlil committed Jun 6, 2017
    Copy the full SHA
    d6ef733 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2017

  1. Copy the full SHA
    72538f1 View commit details
    Browse the repository at this point in the history
  2. Fix Merge with Master

    sadlil committed Jun 7, 2017
    Copy the full SHA
    7bd264d View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    c0afb29 View commit details
    Browse the repository at this point in the history