Merge pull request #195 from Random-Liu/update-kubernetes

Update kubernetes to use new cri log library.

vendor.conf

@@ -1,21 +1,19 @@
-github.com/PuerkitoBio/purell v1.0.0
-github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e
 github.com/docker/distribution edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c
 github.com/docker/docker 4f3616fb1c112e206b88cb7a9922bf49067a7756
 github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1
 github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528
 github.com/emicklei/go-restful ff4f55a206334ef123e4f79bbf348980da81ca46
 github.com/fsnotify/fsnotify f12c6236fe7b5cf6bcf30e5935d08cb079d78334
 github.com/ghodss/yaml 73d445a93680fa1a78ae23a5839bad48f32ba1ee
-github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98
-github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272
-github.com/go-openapi/spec 6aced65f8501fe1217321abf0749d354824ba2ff
-github.com/go-openapi/swag 1d0bd113de87027671077d3c71eb3ac5d7dbba72
 github.com/gogo/protobuf c0656edd0d9eab7c66d1eb0c568f9039345796f7
 github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed
 github.com/golang/protobuf 4bd1920723d7b7c925de087aa32e2187708897f7
 github.com/google/btree 316fb6d3f031ae8f4d457c6c5186b9e3ded70435
 github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c
+github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98
+github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272
+github.com/go-openapi/spec 6aced65f8501fe1217321abf0749d354824ba2ff
+github.com/go-openapi/swag 1d0bd113de87027671077d3c71eb3ac5d7dbba72
 github.com/gregjones/httpcache c1f8028e62adb3d518b823a2f8e6a95c38bdd3aa
 github.com/json-iterator/go f8eb43eda36e882db58fb97d663a9357a379b547
 github.com/juju/ratelimit 5b9ff866471762aa2ab2dced63c9fb6f53921342
@@ -24,6 +22,8 @@ github.com/onsi/ginkgo 67b9df7f55fe1165fd9ad49aca7754cce01a42b8
 github.com/onsi/gomega d59fa0ac68bb5dd932ee8d24eed631cdd519efc3
 github.com/pborman/uuid ca53cad383cad2479bbba7f7a1a05797ec1386e4
 github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6
+github.com/PuerkitoBio/purell v1.0.0
+github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e
 github.com/spf13/pflag 9ff6c6923cfffbcd502984b8e0c80539a94968b7
 github.com/ugorji/go ded73eae5db7e7a0ef6f55aace87a2873c5d2b74
 github.com/urfave/cli 7fb9c86b14e6a702a4157ccb5a863f07d844a207
@@ -39,5 +39,5 @@ k8s.io/api 218912509d74a117d05a718bb926d0948e531c20
 k8s.io/apimachinery 18a564baac720819100827c16fdebcadb05b2d0d
 k8s.io/client-go 72e1c2a1ef30b3f8da039e92d4a6a1f079f374e8
 k8s.io/kube-openapi 39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1
-k8s.io/kubernetes 3b4424ce8ca25b1effc5d9586b3b6727c15fde33
+k8s.io/kubernetes 164317879bcd810b97e5ebf1c8df041770f2ff1b
 k8s.io/utils bf963466fd3fea33c428098b12a89d8ecd012f2