From 5080568f1205683ca6d5313acd0218152949c7b1 Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup@redhat.com>
Date: May 29 2016 14:02:11 +0000
Subject: Bump to origin v1.2.0

resolves: #1340643

---

diff --git a/.gitignore b/.gitignore
index d577e65..4730499 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 /contrib-18bb93d.tar.gz
 /kubernetes-4a3f9c5.tar.gz
-/origin-ef1caba.tar.gz
+/origin-2e62fab.tar.gz
diff --git a/kubernetes.spec b/kubernetes.spec
index 70719ed..348a546 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		ef1caba064de975387860175c3138aad432cf356
+%global commit		2e62fabf9639c792410e98a9a1414937d4b786c9
 %global shortcommit	%(c=%{commit}; echo ${c:0:7})
 
 %global openshift_ip    github.com/openshift/origin
@@ -48,8 +48,8 @@
 %global con_shortcommit %(c=%{con_commit}; echo ${c:0:7})
 
 %global O4N_GIT_MAJOR_VERSION 1
-%global O4N_GIT_MINOR_VERSION 1+
-%global O4N_GIT_VERSION       v1.1.6
+%global O4N_GIT_MINOR_VERSION 2
+%global O4N_GIT_VERSION       v1.2.0
 %global K8S_GIT_VERSION       v1.2.0-36-g4a3f9c5b19c7ff
 %global kube_version          1.2.0
 %global kube_git_version      v%{kube_version}
@@ -61,7 +61,7 @@
 
 Name:		kubernetes
 Version:	%{kube_version}
-Release:	0.21.git%{k8s_shortcommit}%{?dist}
+Release:	0.22.git%{k8s_shortcommit}%{?dist}
 Summary:        Container cluster management
 License:        ASL 2.0
 URL:            %{import_path}
@@ -835,6 +835,10 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
 %systemd_postun
 
 %changelog
+* Sat May 28 2016 jchaloup <jchaloup@redhat.com> - 1.2.0-0.22.git4a3f9c5
+- Bump to origin v1.2.0
+  resolves: #1340643
+
 * Wed May 04 2016 jchaloup <jchaloup@redhat.com> - 1.2.0-0.21.git4a3f9c5
 - Extend uni-test subpackage to run other tests
 
diff --git a/sources b/sources
index 3dbfedd..ac31992 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 3d6fb2bfdd07be4f6c27dd317669087e  contrib-18bb93d.tar.gz
 9bf5c15e6609e0fb0ba08a119e1a5f6a  kubernetes-4a3f9c5.tar.gz
-aef2f73079b930ae3939a5ca18211280  origin-ef1caba.tar.gz
+93616c18161d70fe0dc949e65f71688a  origin-2e62fab.tar.gz