Code

a few cherry-picks#29150

Code

Merged

vdemeester merged 5 commits intomoby:1.12.xmoby/moby:1.12.xfrom vieux:cherry_28026vieux/docker:cherry_28026Copy head branch name to clipboardDec 6, 2016

+73-51

Commits

Commits on Dec 5, 2016

• Return an empty stats if the container is restarting

  Show description for d99532f
  

  boaz0

  authored and

  vieux

  committed
  d99532f

• re-vendor syslog log driver

  Show description for 4da9f49
  

  cpuguy83

  authored and

  vieux

  committed
  4da9f49

• api/server/httputils: ensure consistent status code

  Show description for ed6b8d6
  

  stevvooe

  authored and

  vieux

  committed
  ed6b8d6

• run dnf upgrade before installing in fedora

  Show description for 9d7bae7
  

  andrewhsu

  authored and

  vieux

  committed
  9d7bae7

Commits on Dec 6, 2016

• hack/make.sh: fix BUILDTIME

  Show description for e2b0ade
  

  runcom

  authored and

  vieux

  committed
  e2b0ade