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.

Sign up for GitHub

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

Jump to bottom

Rebase to latest Kubernetes #822

Merged
merged 12 commits into from
Feb 2, 2015
Merged

Rebase to latest Kubernetes #822

merged 12 commits into from
Feb 2, 2015

Commits on Feb 1, 2015

  1. bump(github.com/GoogleCloudPlatform/kubernetes):e335e2d3e26a9a58d3b18… 

    …9ccf41ceb3770d1bfa9
    @smarterclayton
    smarterclayton committed Feb 1, 2015
    Configuration menu
    Copy the full SHA
    7043797 View commit details
    Browse the repository at this point in the history

  2. UPSTREAM: Disable UIs for Kubernetes and etcd

    @smarterclayton
    smarterclayton committed Feb 1, 2015
    Configuration menu
    Copy the full SHA
    361a178 View commit details
    Browse the repository at this point in the history

  3. UPSTREAM: Disable auto-pull when tag is "latest"

    @smarterclayton
    smarterclayton committed Feb 1, 2015
    Configuration menu
    Copy the full SHA
    5133b9d View commit details
    Browse the repository at this point in the history

  4. UPSTREAM: api registration right on mux makes it invisible to container 

    Conflicts:
	Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/master/master.go
    @fabianofranz @smarterclayton
    fabianofranz authored and smarterclayton committed Feb 1, 2015
    Configuration menu
    Copy the full SHA
    c79fb22 View commit details
    Browse the repository at this point in the history

  5. UPSTREAM: Allow namespace short to be set

    @smarterclayton
    smarterclayton committed Feb 1, 2015
    Configuration menu
    Copy the full SHA
    195f71b View commit details
    Browse the repository at this point in the history

  6. UPSTREAM: Add 'release' field to raven-go

    @smarterclayton
    smarterclayton committed Feb 1, 2015
    Configuration menu
    Copy the full SHA
    f8d42a9 View commit details
    Browse the repository at this point in the history

  7. UPSTREAM: Support GetByKey so EventStore can de-dup

    @smarterclayton
    smarterclayton committed Feb 1, 2015
    Configuration menu
    Copy the full SHA
    9aedd34 View commit details
    Browse the repository at this point in the history

  8. UPSTREAM: Relax validation around annotations

    @smarterclayton
    smarterclayton committed Feb 1, 2015
    Configuration menu
    Copy the full SHA
    8046080 View commit details
    Browse the repository at this point in the history

  9. Adapt to upstream changes for cache.Store

    @smarterclayton
    smarterclayton committed Feb 1, 2015
    Configuration menu
    Copy the full SHA
    fa5b55e View commit details
    Browse the repository at this point in the history

  10. Better debug output in deployment_config_controller

    @smarterclayton
    smarterclayton committed Feb 1, 2015
    Configuration menu
    Copy the full SHA
    d4a014b View commit details
    Browse the repository at this point in the history

  11. Refactor to match upstream master changes

    @smarterclayton
    smarterclayton committed Feb 1, 2015
    Configuration menu
    Copy the full SHA
    ad67127 View commit details
    Browse the repository at this point in the history

  12. Remove empty log files and use a slightly different process kill method

    @smarterclayton
    smarterclayton committed Feb 1, 2015
    Configuration menu
    Copy the full SHA
    2fbc30d View commit details
    Browse the repository at this point in the history