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

a few cherry-picks #29150

Merged
merged 5 commits into from
Dec 6, 2016
Merged

a few cherry-picks #29150

merged 5 commits into from
Dec 6, 2016

Commits on Dec 5, 2016

  1. Return an empty stats if the container is restarting

    In case, a container is restarting indefinitely running
    "docker stats --no-stream <restarting_container>" is suspended.
    
    To fix this, the daemon makes sure the container is either not
    running or restarting if `--no-stream` is set to true and if so
    returns an empty stats.
    
    Should fix moby#27772.
    
    Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
    (cherry picked from commit 786a954)
    Signed-off-by: Victor Vieux <victorvieux@gmail.com>
    boaz0 authored and vieux committed Dec 5, 2016
    Configuration menu
    Copy the full SHA
    d99532f View commit details
    Browse the repository at this point in the history
  2. re-vendor syslog log driver

    Signed-off-by: Brian Goff <cpuguy83@gmail.com>
    (cherry picked from commit 00caf03)
    Signed-off-by: Victor Vieux <victorvieux@gmail.com>
    cpuguy83 authored and vieux committed Dec 5, 2016
    Configuration menu
    Copy the full SHA
    4da9f49 View commit details
    Browse the repository at this point in the history
  3. api/server/httputils: ensure consistent status code

    Error code resolution is powered by string matching. Not the greatest
    thing in the world and I hope no one is proud of this code, but it
    works. However, because a map is used, the iteration order of the map is
    random, such that if an error matches two of the snippets, it may return
    a different error code depending on the seed of the hashmap. This change
    converts it to use a slice instead.
    
    Signed-off-by: Stephen J Day <stephen.day@docker.com>
    (cherry picked from commit 3484e02)
    Signed-off-by: Victor Vieux <victorvieux@gmail.com>
    stevvooe authored and vieux committed Dec 5, 2016
    Configuration menu
    Copy the full SHA
    ed6b8d6 View commit details
    Browse the repository at this point in the history
  4. run dnf upgrade before installing in fedora

    Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
    (cherry picked from commit ebd804b)
    Signed-off-by: Victor Vieux <victorvieux@gmail.com>
    andrewhsu authored and vieux committed Dec 5, 2016
    Configuration menu
    Copy the full SHA
    9d7bae7 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2016

  1. hack/make.sh: fix BUILDTIME

    Signed-off-by: Antonio Murdaca <runcom@redhat.com>
    (cherry picked from commit 7b1f77d)
    Signed-off-by: Victor Vieux <victorvieux@gmail.com>
    runcom authored and vieux committed Dec 6, 2016
    Configuration menu
    Copy the full SHA
    e2b0ade View commit details
    Browse the repository at this point in the history