diff --git a/.gitignore b/.gitignore
index a2d6f45..9aee0ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-/kubernetes-86b4e77.tar.gz
-/contrib-99f38cc.tar.gz
-/origin-e9a6ef1.tar.gz
+/origin-403de38.tar.gz
+/kubernetes-4c8e6f4.tar.gz
+/contrib-1c4eb2d.tar.gz
diff --git a/0001-internal-inteernal.patch b/0001-internal-inteernal.patch
index 2f290e6..2df9c01 100644
--- a/0001-internal-inteernal.patch
+++ b/0001-internal-inteernal.patch
@@ -1,11 +1,10 @@
-From 18fceae12a70e5535c7458c0b162b805deb7931a Mon Sep 17 00:00:00 2001
+From cb965eaa282d735497e5e8d10b35b4867473a968 Mon Sep 17 00:00:00 2001
 From: Jan Chaloupka <jchaloup@redhat.com>
-Date: Wed, 23 Sep 2015 16:11:38 +0200
+Date: Tue, 20 Oct 2015 12:41:40 +0200
 Subject: [PATCH] internal->inteernal
 
 ---
- .../gcloud-golang/compute/metadata/metadata.go     |    2 +-
- .../cloud/compute/metadata/metadata.go             |    2 +-
+ .../cloud/compute/metadata/metadata.go             |    4 +-
  .../src/google.golang.org/cloud/inteernal/cloud.go |  128 ++
  .../cloud/inteernal/datastore/datastore_v1.pb.go   | 1633 ++++++++++++++++++++
  .../cloud/inteernal/datastore/datastore_v1.proto   |  594 +++++++
@@ -14,7 +13,7 @@ Subject: [PATCH] internal->inteernal
  .../cloud/internal/datastore/datastore_v1.pb.go    | 1633 --------------------
  .../cloud/internal/datastore/datastore_v1.proto    |  594 -------
  .../cloud/internal/testutil/context.go             |   57 -
- 10 files changed, 2414 insertions(+), 2414 deletions(-)
+ 9 files changed, 2414 insertions(+), 2414 deletions(-)
  create mode 100644 Godeps/_workspace/src/google.golang.org/cloud/inteernal/cloud.go
  create mode 100644 Godeps/_workspace/src/google.golang.org/cloud/inteernal/datastore/datastore_v1.pb.go
  create mode 100644 Godeps/_workspace/src/google.golang.org/cloud/inteernal/datastore/datastore_v1.proto
@@ -24,21 +23,8 @@ Subject: [PATCH] internal->inteernal
  delete mode 100644 Godeps/_workspace/src/google.golang.org/cloud/internal/datastore/datastore_v1.proto
  delete mode 100644 Godeps/_workspace/src/google.golang.org/cloud/internal/testutil/context.go
 
-diff --git a/Godeps/_workspace/src/github.com/GoogleCloudPlatform/gcloud-golang/compute/metadata/metadata.go b/Godeps/_workspace/src/github.com/GoogleCloudPlatform/gcloud-golang/compute/metadata/metadata.go
-index b007cde..c92267f 100644
---- a/Godeps/_workspace/src/github.com/GoogleCloudPlatform/gcloud-golang/compute/metadata/metadata.go
-+++ b/Godeps/_workspace/src/github.com/GoogleCloudPlatform/gcloud-golang/compute/metadata/metadata.go
-@@ -30,7 +30,7 @@ import (
- 	"sync"
- 	"time"
- 
--	"google.golang.org/cloud/internal"
-+	"google.golang.org/cloud/inteernal"
- )
- 
- type cachedValue struct {
 diff --git a/Godeps/_workspace/src/google.golang.org/cloud/compute/metadata/metadata.go b/Godeps/_workspace/src/google.golang.org/cloud/compute/metadata/metadata.go
-index 7753a05..6102500 100644
+index 7753a05..2d9c630 100644
 --- a/Godeps/_workspace/src/google.golang.org/cloud/compute/metadata/metadata.go
 +++ b/Godeps/_workspace/src/google.golang.org/cloud/compute/metadata/metadata.go
 @@ -29,7 +29,7 @@ import (
@@ -50,9 +36,18 @@ index 7753a05..6102500 100644
  )
  
  type cachedValue struct {
+@@ -46,7 +46,7 @@ var (
+ )
+ 
+ var metaClient = &http.Client{
+-	Transport: &internal.Transport{
++	Transport: &inteernal.Transport{
+ 		Base: &http.Transport{
+ 			Dial: dialer().Dial,
+ 			ResponseHeaderTimeout: 750 * time.Millisecond,
 diff --git a/Godeps/_workspace/src/google.golang.org/cloud/inteernal/cloud.go b/Godeps/_workspace/src/google.golang.org/cloud/inteernal/cloud.go
 new file mode 100644
-index 0000000..984323c
+index 0000000..af9355b
 --- /dev/null
 +++ b/Godeps/_workspace/src/google.golang.org/cloud/inteernal/cloud.go
 @@ -0,0 +1,128 @@
@@ -73,7 +68,7 @@ index 0000000..984323c
 +// Package internal provides support for the cloud packages.
 +//
 +// Users should not import this package directly.
-+package internal
++package inteernal
 +
 +import (
 +	"fmt"
diff --git a/hack-test-cmd-for-o4n.patch b/hack-test-cmd-for-o4n.patch
deleted file mode 100644
index 587f298..0000000
--- a/hack-test-cmd-for-o4n.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From b13efe3e00ace16c1eb3a8316839ce7c726a899d Mon Sep 17 00:00:00 2001
-From: Jan Chaloupka <jchaloup@redhat.com>
-Date: Sat, 10 Oct 2015 02:46:49 +0200
-Subject: [PATCH] hack test-cmd for o4n
-
----
- hack/lib/init.sh |  2 +-
- hack/test-cmd.sh | 10 +++++-----
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/hack/lib/init.sh b/hack/lib/init.sh
-index 8a2c428..992aa18 100644
---- a/hack/lib/init.sh
-+++ b/hack/lib/init.sh
-@@ -39,4 +39,4 @@ source "${KUBE_ROOT}/hack/lib/version.sh"
- source "${KUBE_ROOT}/hack/lib/golang.sh"
- source "${KUBE_ROOT}/hack/lib/etcd.sh"
- 
--KUBE_OUTPUT_HOSTBIN="${KUBE_OUTPUT_BINPATH}/$(kube::util::host_platform)"
-+KUBE_OUTPUT_HOSTBIN="${KUBE_OUTPUT_HOSTBIN:-${KUBE_OUTPUT_BINPATH}/$(kube::util::host_platform)}"
-diff --git a/hack/test-cmd.sh b/hack/test-cmd.sh
-index 2ffa525..d10d451 100755
---- a/hack/test-cmd.sh
-+++ b/hack/test-cmd.sh
-@@ -163,7 +163,7 @@ runTests() {
-       -s "http://127.0.0.1:${API_PORT}"
-       --match-server-version
-     )
--    [ "$(kubectl get nodes -o go-template='{{ .apiVersion }}' "${kube_flags[@]}")" == "v1" ]
-+    [ "$(kubectl get nodes -o template --template="{{ .apiVersion }}" "${kube_flags[@]}")" == "v1" ]
-   else
-     kube_flags=(
-       -s "http://127.0.0.1:${API_PORT}"
-@@ -191,7 +191,7 @@ runTests() {
- 
-   # Make sure the UI can be proxied
-   start-proxy --api-prefix=/
--  check-curl-proxy-code /ui 301
-+  check-curl-proxy-code /ui 404
-   check-curl-proxy-code /metrics 200
-   if [[ -n "${version}" ]]; then
-     check-curl-proxy-code /api/${version}/namespaces 200
-@@ -210,7 +210,7 @@ runTests() {
- 
-   # Custom paths let you see everything.
-   start-proxy --api-prefix=/custom
--  check-curl-proxy-code /custom/ui 301
-+  check-curl-proxy-code /custom/ui 404
-   check-curl-proxy-code /custom/metrics 200
-   if [[ -n "${version}" ]]; then
-     check-curl-proxy-code /custom/api/${version}/namespaces 200
-@@ -788,8 +788,8 @@ __EOF__
-   kubectl create -f examples/cassandra/cassandra-controller.yaml "${kube_flags[@]}"
-   kubectl scale rc cassandra --replicas=1 "${kube_flags[@]}"
-   kubectl create -f examples/cassandra/cassandra-service.yaml "${kube_flags[@]}"
--  kube::test::get_object_assert "all -l'name=cassandra'" "{{range.items}}{{range .metadata.labels}}{{.}}:{{end}}{{end}}" 'cassandra:cassandra:cassandra:'
--  kubectl delete all -l name=cassandra "${kube_flags[@]}"
-+  kube::test::get_object_assert "rc,services,pods -l'name=cassandra'" "{{range.items}}{{range .metadata.labels}}{{.}}:{{end}}{{end}}" 'cassandra:cassandra:cassandra:'
-+  kubectl delete rc,services,pods -l name=cassandra "${kube_flags[@]}"
- 
- 
-   ###########
--- 
-1.9.3
-
diff --git a/hack-test-cmd-for-os-origin.patch b/hack-test-cmd-for-os-origin.patch
new file mode 100644
index 0000000..7c78c0d
--- /dev/null
+++ b/hack-test-cmd-for-os-origin.patch
@@ -0,0 +1,98 @@
+From b2c20400f1e35a4a04038d58fb364470de81af13 Mon Sep 17 00:00:00 2001
+From: Jan Chaloupka <jchaloup@redhat.com>
+Date: Tue, 20 Oct 2015 15:12:08 +0200
+Subject: [PATCH] hack test-cmd for os origin
+
+---
+ hack/lib/init.sh |  2 +-
+ hack/test-cmd.sh | 18 +++++++++---------
+ 2 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/hack/lib/init.sh b/hack/lib/init.sh
+index 8a2c428..992aa18 100644
+--- a/hack/lib/init.sh
++++ b/hack/lib/init.sh
+@@ -39,4 +39,4 @@ source "${KUBE_ROOT}/hack/lib/version.sh"
+ source "${KUBE_ROOT}/hack/lib/golang.sh"
+ source "${KUBE_ROOT}/hack/lib/etcd.sh"
+ 
+-KUBE_OUTPUT_HOSTBIN="${KUBE_OUTPUT_BINPATH}/$(kube::util::host_platform)"
++KUBE_OUTPUT_HOSTBIN="${KUBE_OUTPUT_HOSTBIN:-${KUBE_OUTPUT_BINPATH}/$(kube::util::host_platform)}"
+diff --git a/hack/test-cmd.sh b/hack/test-cmd.sh
+index 11ce998..284571e 100755
+--- a/hack/test-cmd.sh
++++ b/hack/test-cmd.sh
+@@ -186,14 +186,14 @@ runTests() {
+       -s "http://127.0.0.1:${API_PORT}"
+       --match-server-version
+     )
+-    [ "$(kubectl get nodes -o go-template='{{ .apiVersion }}' "${kube_flags[@]}")" == "v1" ]
++    [ "$(kubectl get nodes -o template --template="{{ .apiVersion }}" "${kube_flags[@]}")" == "v1" ]
+   else
+     kube_flags=(
+       -s "http://127.0.0.1:${API_PORT}"
+       --match-server-version
+       --api-version="${version}"
+     )
+-    [ "$(kubectl get nodes -o go-template='{{ .apiVersion }}' "${kube_flags[@]}")" == "${version}" ]
++    [ "$(kubectl get nodes -o template --template='{{ .apiVersion }}' "${kube_flags[@]}")" == "${version}" ]
+   fi
+   id_field=".metadata.name"
+   labels_field=".metadata.labels"
+@@ -215,13 +215,13 @@ runTests() {
+ 
+   # Make sure the UI can be proxied
+   start-proxy
+-  check-curl-proxy-code /ui 301
++  check-curl-proxy-code /ui 404
+   check-curl-proxy-code /metrics 200
+   check-curl-proxy-code /api/ui 404
+   if [[ -n "${version}" ]]; then
+     check-curl-proxy-code /api/${version}/namespaces 200
+   fi
+-  check-curl-proxy-code /static/ 200
++  check-curl-proxy-code /static/ 404
+   stop-proxy
+ 
+   # Make sure the in-development api is accessible by default
+@@ -232,7 +232,7 @@ runTests() {
+ 
+   # Custom paths let you see everything.
+   start-proxy /custom
+-  check-curl-proxy-code /custom/ui 301
++  check-curl-proxy-code /custom/ui 404
+   check-curl-proxy-code /custom/metrics 200
+   if [[ -n "${version}" ]]; then
+     check-curl-proxy-code /custom/api/${version}/namespaces 200
+@@ -429,7 +429,7 @@ runTests() {
+   # Command
+   # Needs to retry because other party may change the resource.
+   for count in $(seq 0 3); do
+-    resourceVersion=$(kubectl get "${kube_flags[@]}" pod valid-pod -o go-template='{{ .metadata.resourceVersion }}')
++    resourceVersion=$(kubectl get "${kube_flags[@]}" pod valid-pod -o template --template='{{ .metadata.resourceVersion }}')
+     kubectl patch "${kube_flags[@]}" pod valid-pod -p='{"spec":{"containers":[{"name": "kubernetes-serve-hostname", "image": "nginx"}]},"metadata":{"resourceVersion":"'$resourceVersion'"}}' 2> "${ERROR_FILE}" || true
+     if grep -q "the object has been modified" "${ERROR_FILE}"; then
+       kube::log::status "retry $1, error: $(cat ${ERROR_FILE})"
+@@ -443,7 +443,7 @@ runTests() {
+   done
+ 
+   ## If the resourceVersion is the different from the one stored in the server, the patch will be rejected.
+-  resourceVersion=$(kubectl get "${kube_flags[@]}" pod valid-pod -o go-template='{{ .metadata.resourceVersion }}')
++  resourceVersion=$(kubectl get "${kube_flags[@]}" pod valid-pod -o template --template='{{ .metadata.resourceVersion }}')
+   ((resourceVersion+=100))
+   # Command
+   kubectl patch "${kube_flags[@]}" pod valid-pod -p='{"spec":{"containers":[{"name": "kubernetes-serve-hostname", "image": "nginx"}]},"metadata":{"resourceVersion":"'$resourceVersion'"}}' 2> "${ERROR_FILE}" || true
+@@ -999,8 +999,8 @@ __EOF__
+   kubectl create -f examples/cassandra/cassandra-controller.yaml "${kube_flags[@]}"
+   kubectl scale rc cassandra --replicas=1 "${kube_flags[@]}"
+   kubectl create -f examples/cassandra/cassandra-service.yaml "${kube_flags[@]}"
+-  kube::test::get_object_assert "all -l'name=cassandra'" "{{range.items}}{{range .metadata.labels}}{{.}}:{{end}}{{end}}" 'cassandra:cassandra:cassandra:'
+-  kubectl delete all -l name=cassandra "${kube_flags[@]}"
++  kube::test::get_object_assert "rc,services,pods -l'name=cassandra'" "{{range.items}}{{range .metadata.labels}}{{.}}:{{end}}{{end}}" 'cassandra:cassandra:cassandra:'
++  kubectl delete rc,services,pods -l name=cassandra "${kube_flags[@]}"
+ 
+ 
+   ###########
+-- 
+1.9.3
+
diff --git a/keep-solid-port-for-kube-proxy.patch b/keep-solid-port-for-kube-proxy.patch
new file mode 100644
index 0000000..95bc4b4
--- /dev/null
+++ b/keep-solid-port-for-kube-proxy.patch
@@ -0,0 +1,54 @@
+From afe79dfc2c0f9417da623c1907e60667b27375ea Mon Sep 17 00:00:00 2001
+From: Jan Chaloupka <jchaloup@redhat.com>
+Date: Tue, 20 Oct 2015 14:53:39 +0200
+Subject: [PATCH] keep solid port for kube-proxy
+
+---
+ hack/test-cmd.sh | 17 ++++-------------
+ 1 file changed, 4 insertions(+), 13 deletions(-)
+
+diff --git a/hack/test-cmd.sh b/hack/test-cmd.sh
+index c20fac7..fa760b5 100755
+--- a/hack/test-cmd.sh
++++ b/hack/test-cmd.sh
+@@ -30,7 +30,6 @@ function stop-proxy()
+ {
+   [[ -n "${PROXY_PID-}" ]] && kill "${PROXY_PID}" 1>&2 2>/dev/null
+   PROXY_PID=
+-  PROXY_PORT=
+ }
+ 
+ # Starts "kubect proxy" to test the client proxy. $1: api_prefix
+@@ -40,18 +39,9 @@ function start-proxy()
+ 
+   kube::log::status "Starting kubectl proxy"
+ 
+-  for retry in $(seq 1 3); do
+-    PROXY_PORT=$(kube::util::get_random_port)
+-    kube::log::status "On try ${retry}, use proxy port ${PROXY_PORT} if it's free"
+-    if kube::util::test_host_port_free "127.0.0.1" "${PROXY_PORT}"; then
+-      if [ $# -eq 0 ]; then
+-        kubectl proxy -p ${PROXY_PORT} --www=. 1>&2 & break
+-      else
+-        kubectl proxy -p ${PROXY_PORT} --www=. --api-prefix="$1" 1>&2 & break
+-      fi
+-    fi
+-    sleep 1;
+-  done
++  # the --www and --www-prefix are just to make something definitely show up for
++  # wait_for_url to see.
++  kubectl proxy -p ${PROXY_PORT} --www=. --www-prefix=/healthz "$@" 1>&2 &
+ 
+   PROXY_PID=$!
+   if [ $# -eq 0 ]; then
+@@ -119,6 +109,7 @@ API_HOST=${API_HOST:-127.0.0.1}
+ KUBELET_PORT=${KUBELET_PORT:-10250}
+ KUBELET_HEALTHZ_PORT=${KUBELET_HEALTHZ_PORT:-10248}
+ CTLRMGR_PORT=${CTLRMGR_PORT:-10252}
++PROXY_PORT=${PROXY_PORT:-8001}
+ PROXY_HOST=127.0.0.1 # kubectl only serves on localhost.
+ 
+ # ensure ~/.kube/config isn't loaded by tests
+-- 
+1.9.3
+
diff --git a/kubernetes.spec b/kubernetes.spec
index a2337b0..0b3ff37 100644
--- a/kubernetes.spec
+++ b/kubernetes.spec
@@ -21,7 +21,7 @@
 # https://github.com/openshift/origin
 %global provider_prefix	%{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path     k8s.io/kubernetes
-%global commit		e9a6ef1cd4c29d45730289a497d18b19d7ba450d
+%global commit		403de3874fba420fd096f2329b45fe2f5ae97e46
 %global shortcommit	%(c=%{commit}; echo ${c:0:7})
 
 %global openshift_ip    github.com/openshift/origin
@@ -32,7 +32,7 @@
 %global k8s_repo            kubernetes
 # https://github.com/kubernetes/kubernetes
 %global k8s_provider_prefix %{k8s_provider}.%{k8s_provider_tld}/%{k8s_project}/%{k8s_repo}
-%global k8s_commit      86b4e777e1947c1bc00e422306a3ca74cbd54dbe
+%global k8s_commit      4c8e6f47ec23f390978e651232b375f5f9cde3c7
 %global k8s_shortcommit %(c=%{k8s_commit}; echo ${c:0:7})
 %global k8s_src_dir     Godeps/_workspace/src/k8s.io/kubernetes/
 %global k8s_src_dir_sed Godeps\\/_workspace\\/src\\/k8s\\.io\\/kubernetes\\/
@@ -43,7 +43,7 @@
 %global con_repo            contrib
 # https://github.com/kubernetes/kubernetes
 %global con_provider_prefix %{con_provider}.%{con_provider_tld}/%{con_project}/%{con_repo}
-%global con_commit      99f38ccb575264209e9c3faff23672b45776a8cc
+%global con_commit      1c4eb2d56c70adfb2eda7c7d2543b40274d5ede8
 %global con_shortcommit %(c=%{con_commit}; echo ${c:0:7})
 
 %global O4N_GIT_MAJOR_VERSION 1
@@ -57,8 +57,8 @@
 %global _checkshell	/bin/bash
 
 Name:		kubernetes
-Version:	1.1.0
-Release:	0.41.alpha1.git%{shortcommit}%{?dist}
+Version:	1.2.0
+Release:	0.1.alpha1.git%{k8s_shortcommit}%{?dist}
 Summary:        Container cluster management
 License:        ASL 2.0
 URL:            %{import_path}
@@ -75,13 +75,14 @@ Patch3:         build-with-debug-info.patch
 
 Patch4:         internal-to-inteernal.patch
 Patch5:         0001-internal-inteernal.patch
-Patch6:         append-missing-flags-to-cobra-flags.patch
 
 # k8s uses default cluster if not specified, o4n does not
 Patch7:         do-not-unset-default-cluster.patch
 
 Patch8:         add-missing-short-option-for-server.patch
-Patch9:         hack-test-cmd-for-o4n.patch
+Patch9:         hack-test-cmd-for-os-origin.patch
+# Due to k8s 5d08dcf8377e76f2ce303dc79404f511ebef82e3
+Patch10:        keep-solid-port-for-kube-proxy.patch
 
 # It obsoletes cadvisor but needs its source code (literally integrated)
 Obsoletes:      cadvisor
@@ -99,15 +100,50 @@ Requires: kubernetes-node = %{version}-%{release}
 Summary:       %{summary}
 BuildArch:      noarch
 
+Provides: golang(%{import_path}/cmd/genutils) = %{version}-%{release}
 Provides: golang(%{import_path}/cmd/kube-apiserver/app) = %{version}-%{release}
 Provides: golang(%{import_path}/cmd/kube-controller-manager/app) = %{version}-%{release}
 Provides: golang(%{import_path}/cmd/kube-proxy/app) = %{version}-%{release}
 Provides: golang(%{import_path}/cmd/kubelet/app) = %{version}-%{release}
+Provides: golang(%{import_path}/contrib/mesos/pkg/archive) = %{version}-%{release}
+Provides: golang(%{import_path}/contrib/mesos/pkg/assert) = %{version}-%{release}
+Provides: golang(%{import_path}/contrib/mesos/pkg/backoff) = %{version}-%{release}
+Provides: golang(%{import_path}/contrib/mesos/pkg/controllermanager) = %{version}-%{release}
+Provides: golang(%{import_path}/contrib/mesos/pkg/election) = %{version}-%{release}
+Provides: golang(%{import_path}/contrib/mesos/pkg/executor) = %{version}-%{release}
+Provides: golang(%{import_path}/contrib/mesos/pkg/executor/config) = %{version}-%{release}
+Provides: golang(%{import_path}/contrib/mesos/pkg/executor/messages) = %{version}-%{release}
+Provides: golang(%{import_path}/contrib/mesos/pkg/executor/service) = %{version}-%{release}
+Provides: golang(%{import_path}/contrib/mesos/pkg/hyperkube) = %{version}-%{release}
+Provides: golang(%{import_path}/contrib/mesos/pkg/minion) = %{version}-%{release}
+Provides: golang(%{import_path}/contrib/mesos/pkg/minion/config) = %{version}-%{release}
+Provides: golang(%{import_path}/contrib/mesos/pkg/minion/tasks) = %{version}-%{release}
+Provides: golang(%{import_path}/contrib/mesos/pkg/node) = %{version}-%{release}
+Provides: golang(%{import_path}/contrib/mesos/pkg/offers) = %{version}-%{release}
+Provides: golang(%{import_path}/contrib/mesos/pkg/offers/metrics) = %{version}-%{release}
+Provides: golang(%{import_path}/contrib/mesos/pkg/proc) = %{version}-%{release}
+Provides: golang(%{import_path}/contrib/mesos/pkg/profile) = %{version}-%{release}
+Provides: golang(%{import_path}/contrib/mesos/pkg/queue) = %{version}-%{release}
+Provides: golang(%{import_path}/contrib/mesos/pkg/redirfd) = %{version}-%{release}
+Provides: golang(%{import_path}/contrib/mesos/pkg/runtime) = %{version}-%{release}
+Provides: golang(%{import_path}/contrib/mesos/pkg/scheduler) = %{version}-%{release}
+Provides: golang(%{import_path}/contrib/mesos/pkg/scheduler/config) = %{version}-%{release}
+Provides: golang(%{import_path}/contrib/mesos/pkg/scheduler/constraint) = %{version}-%{release}
+Provides: golang(%{import_path}/contrib/mesos/pkg/scheduler/ha) = %{version}-%{release}
+Provides: golang(%{import_path}/contrib/mesos/pkg/scheduler/meta) = %{version}-%{release}
+Provides: golang(%{import_path}/contrib/mesos/pkg/scheduler/metrics) = %{version}-%{release}
+Provides: golang(%{import_path}/contrib/mesos/pkg/scheduler/podtask) = %{version}-%{release}
+Provides: golang(%{import_path}/contrib/mesos/pkg/scheduler/resource) = %{version}-%{release}
+Provides: golang(%{import_path}/contrib/mesos/pkg/scheduler/service) = %{version}-%{release}
+Provides: golang(%{import_path}/contrib/mesos/pkg/scheduler/slave) = %{version}-%{release}
+Provides: golang(%{import_path}/contrib/mesos/pkg/scheduler/uid) = %{version}-%{release}
+Provides: golang(%{import_path}/contrib/mesos/pkg/service) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/admission) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/api) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/api/endpoints) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/api/errors) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/api/errors/etcd) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/api/install) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/api/latest) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/api/meta) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/api/registered) = %{version}-%{release}
@@ -116,17 +152,18 @@ Provides: golang(%{import_path}/pkg/api/rest) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/api/rest/resttest) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/api/testapi) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/api/testing) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/api/testing/compat) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/api/unversioned) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/api/util) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/api/v1) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/api/v1beta3) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/api/validation) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/apis/experimental) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/apis/experimental/latest) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/apis/experimental/testapi) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/apis/experimental/v1) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/apis/experimental/validation) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/apis/extensions) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/apis/extensions/install) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/apis/extensions/v1beta1) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/apis/extensions/validation) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/apiserver) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/apiserver/metrics) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/apiserver/testing) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/auth/authenticator) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/auth/authenticator/bearertoken) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/auth/authorizer) = %{version}-%{release}
@@ -145,6 +182,7 @@ Provides: golang(%{import_path}/pkg/client/unversioned/clientcmd) = %{version}-%
 Provides: golang(%{import_path}/pkg/client/unversioned/clientcmd/api) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/client/unversioned/clientcmd/api/latest) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/client/unversioned/clientcmd/api/v1) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/client/unversioned/fake) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/client/unversioned/portforward) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/client/unversioned/remotecommand) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/client/unversioned/testclient) = %{version}-%{release}
@@ -160,8 +198,11 @@ Provides: golang(%{import_path}/pkg/cloudprovider/providers/rackspace) = %{versi
 Provides: golang(%{import_path}/pkg/cloudprovider/providers/vagrant) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/controller) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/controller/daemon) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/controller/deployment) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/controller/endpoint) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/controller/framework) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/controller/gc) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/controller/job) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/controller/namespace) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/controller/node) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/controller/persistentvolume) = %{version}-%{release}
@@ -180,11 +221,15 @@ Provides: golang(%{import_path}/pkg/fieldpath) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/fields) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/healthz) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/httplog) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/hyperkube) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/kubectl) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/kubectl/cmd) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/kubectl/cmd/config) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/kubectl/cmd/util) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/kubectl/cmd/util/editor) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/kubectl/cmd/util/jsonmerge) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/kubectl/resource) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/kubectl/testing) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/kubelet) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/kubelet/cadvisor) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/kubelet/config) = %{version}-%{release}
@@ -195,14 +240,19 @@ Provides: golang(%{import_path}/pkg/kubelet/leaky) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/kubelet/lifecycle) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/kubelet/metrics) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/kubelet/network) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/kubelet/network/cni) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/kubelet/network/exec) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/kubelet/network/hairpin) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/kubelet/pod) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/kubelet/prober) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/kubelet/prober/results) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/kubelet/qos) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/kubelet/qos/util) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/kubelet/rkt) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/kubelet/status) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/kubelet/types) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/kubelet/util) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/kubemark) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/labels) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/master) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/master/ports) = %{version}-%{release}
@@ -214,6 +264,7 @@ Provides: golang(%{import_path}/pkg/proxy) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/proxy/config) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/proxy/iptables) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/proxy/userspace) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/registry) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/registry/componentstatus) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/registry/controller) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/registry/controller/etcd) = %{version}-%{release}
@@ -231,6 +282,8 @@ Provides: golang(%{import_path}/pkg/registry/generic/etcd) = %{version}-%{releas
 Provides: golang(%{import_path}/pkg/registry/generic/rest) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/registry/horizontalpodautoscaler) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/registry/horizontalpodautoscaler/etcd) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/registry/ingress) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/registry/ingress/etcd) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/registry/job) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/registry/job/etcd) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/registry/limitrange) = %{version}-%{release}
@@ -252,8 +305,6 @@ Provides: golang(%{import_path}/pkg/registry/resourcequota) = %{version}-%{relea
 Provides: golang(%{import_path}/pkg/registry/resourcequota/etcd) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/registry/secret) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/registry/secret/etcd) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/registry/securitycontextconstraints) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/registry/securitycontextconstraints/etcd) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/registry/service) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/registry/service/allocator) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/registry/service/allocator/etcd) = %{version}-%{release}
@@ -271,11 +322,9 @@ Provides: golang(%{import_path}/pkg/registry/thirdpartyresourcedata) = %{version
 Provides: golang(%{import_path}/pkg/registry/thirdpartyresourcedata/etcd) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/runtime) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/securitycontext) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/securitycontextconstraints) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/securitycontextconstraints/selinux) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/securitycontextconstraints/user) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/storage) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/storage/etcd) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/storage/testing) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/tools) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/tools/etcdtest) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/tools/metrics) = %{version}-%{release}
@@ -286,6 +335,7 @@ Provides: golang(%{import_path}/pkg/util) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/util/bandwidth) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/util/config) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/util/dbus) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/util/deployment) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/util/errors) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/util/exec) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/util/fielderrors) = %{version}-%{release}
@@ -295,6 +345,7 @@ Provides: golang(%{import_path}/pkg/util/httpstream/spdy) = %{version}-%{release
 Provides: golang(%{import_path}/pkg/util/io) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/util/iptables) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/util/jsonpath) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/util/limitwriter) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/util/mount) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/util/node) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/util/oom) = %{version}-%{release}
@@ -305,8 +356,11 @@ Provides: golang(%{import_path}/pkg/util/rand) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/util/sets) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/util/slice) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/util/strategicpatch) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/util/sysctl) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/util/validation) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/util/wait) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/util/workqueue) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/util/wsstream) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/util/yaml) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/version) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/version/verflag) = %{version}-%{release}
@@ -316,6 +370,8 @@ Provides: golang(%{import_path}/pkg/volume/cephfs) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/volume/cinder) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/volume/downwardapi) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/volume/empty_dir) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/volume/fc) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/volume/flocker) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/volume/gce_pd) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/volume/git_repo) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/volume/glusterfs) = %{version}-%{release}
@@ -331,7 +387,7 @@ Provides: golang(%{import_path}/pkg/watch/json) = %{version}-%{release}
 Provides: golang(%{import_path}/plugin/cmd/kube-scheduler/app) = %{version}-%{release}
 Provides: golang(%{import_path}/plugin/pkg/admission/admit) = %{version}-%{release}
 Provides: golang(%{import_path}/plugin/pkg/admission/deny) = %{version}-%{release}
-Provides: golang(%{import_path}/plugin/pkg/admission/exec/denyprivileged) = %{version}-%{release}
+Provides: golang(%{import_path}/plugin/pkg/admission/exec) = %{version}-%{release}
 Provides: golang(%{import_path}/plugin/pkg/admission/initialresources) = %{version}-%{release}
 Provides: golang(%{import_path}/plugin/pkg/admission/limitranger) = %{version}-%{release}
 Provides: golang(%{import_path}/plugin/pkg/admission/namespace/autoprovision) = %{version}-%{release}
@@ -340,6 +396,10 @@ Provides: golang(%{import_path}/plugin/pkg/admission/namespace/lifecycle) = %{ve
 Provides: golang(%{import_path}/plugin/pkg/admission/resourcequota) = %{version}-%{release}
 Provides: golang(%{import_path}/plugin/pkg/admission/securitycontext/scdeny) = %{version}-%{release}
 Provides: golang(%{import_path}/plugin/pkg/admission/serviceaccount) = %{version}-%{release}
+Provides: golang(%{import_path}/plugin/pkg/auth) = %{version}-%{release}
+Provides: golang(%{import_path}/plugin/pkg/auth/authenticator) = %{version}-%{release}
+Provides: golang(%{import_path}/plugin/pkg/auth/authenticator/password) = %{version}-%{release}
+Provides: golang(%{import_path}/plugin/pkg/auth/authenticator/password/allow) = %{version}-%{release}
 Provides: golang(%{import_path}/plugin/pkg/auth/authenticator/password/passwordfile) = %{version}-%{release}
 Provides: golang(%{import_path}/plugin/pkg/auth/authenticator/request/basicauth) = %{version}-%{release}
 Provides: golang(%{import_path}/plugin/pkg/auth/authenticator/request/keystone) = %{version}-%{release}
@@ -347,6 +407,7 @@ Provides: golang(%{import_path}/plugin/pkg/auth/authenticator/request/union) = %
 Provides: golang(%{import_path}/plugin/pkg/auth/authenticator/request/x509) = %{version}-%{release}
 Provides: golang(%{import_path}/plugin/pkg/auth/authenticator/token/oidc) = %{version}-%{release}
 Provides: golang(%{import_path}/plugin/pkg/auth/authenticator/token/tokenfile) = %{version}-%{release}
+Provides: golang(%{import_path}/plugin/pkg/auth/authenticator/token/tokentest) = %{version}-%{release}
 Provides: golang(%{import_path}/plugin/pkg/scheduler) = %{version}-%{release}
 Provides: golang(%{import_path}/plugin/pkg/scheduler/algorithm) = %{version}-%{release}
 Provides: golang(%{import_path}/plugin/pkg/scheduler/algorithm/predicates) = %{version}-%{release}
@@ -360,6 +421,8 @@ Provides: golang(%{import_path}/plugin/pkg/scheduler/api/validation) = %{version
 Provides: golang(%{import_path}/plugin/pkg/scheduler/factory) = %{version}-%{release}
 Provides: golang(%{import_path}/plugin/pkg/scheduler/metrics) = %{version}-%{release}
 Provides: golang(%{import_path}/test/e2e) = %{version}-%{release}
+Provides: golang(%{import_path}/test/integration) = %{version}-%{release}
+Provides: golang(%{import_path}/test/integration/framework) = %{version}-%{release}
 
 %description devel
 %{summary}
@@ -434,7 +497,10 @@ Kubernetes client tools like kubectl
 
 %prep
 %setup -q -n %{k8s_repo}-%{k8s_commit} -T -b 1
+# Hack test-cmd.sh to be run with os binaries
 %patch9 -p1
+# Keep solid port for kube-proxy
+%patch10 -p1
 
 %setup -q -n %{con_repo}-%{con_commit} -T -b 2
 %setup -q -n %{repo}-%{commit}
@@ -455,11 +521,10 @@ rm -rf cmd/kube-version-change/import_known_versions.go
 # internal -> inteernal
 %patch4 -p1
 %patch5 -p1
-# cobra options
-%patch6 -p1
 # do not unset default cluster
 %patch7 -p1
 
+# add missing -s for --server
 %patch8 -p1
 
 %build
@@ -682,6 +747,10 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
 %systemd_postun
 
 %changelog
+* Tue Oct 20 2015 jchaloup <jchaloup@redhat.com> - 1.2.0-0.1.alpha1.git4c8e6f4
+- Bump to upstream 403de3874fba420fd096f2329b45fe2f5ae97e46
+  related: #1211266
+
 * Wed Oct 14 2015 jchaloup <jchaloup@redhat.com> - 1.1.0-0.41.alpha1.gite9a6ef1
 - Bump to origin upstream e9a6ef1cd4c29d45730289a497d18b19d7ba450d
   related: #1211266
diff --git a/sources b/sources
index 9b8bf7b..ef67879 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-869f5d20b3671ef89a6827ec56df41aa  kubernetes-86b4e77.tar.gz
-0371c28371664eda4fcf61c3f5911166  contrib-99f38cc.tar.gz
-46d71141f7d47a0c22535d4c88093cc7  origin-e9a6ef1.tar.gz
+cfaaad219974a94e790d7dfe01e51615  origin-403de38.tar.gz
+8e652c2ab7360390d0e65a6bad9fee04  kubernetes-4c8e6f4.tar.gz
+3954b7cbf55609b5b5b65030a01b32c7  contrib-1c4eb2d.tar.gz