jchaloup pushed to kubernetes (master). "Obsolete cadvisor as it is integrated in kubelet (..more)"

[notifications at fedoraproject.org]

>From 77b7cadb70b753686b038bd84f57cdbdedee0663 Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup at redhat.com>
Date: Fri, 17 Apr 2015 16:40:24 +0200
Subject: Obsolete cadvisor as it is integrated in kubelet - related: #1211266


diff --git a/kubernetes.spec b/kubernetes.spec
index bbbb345..5b13819 100644
--- a/kubernetes.spec
+++ b/kubernetes.spec
@@ -15,7 +15,7 @@
 
 Name:		kubernetes
 Version:	0.15.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Container cluster management
 License:	ASL 2.0
 URL:		https://github.com/GoogleCloudPlatform/kubernetes
@@ -23,6 +23,8 @@ ExclusiveArch:	x86_64
 Source0:	https://github.com/GoogleCloudPlatform/kubernetes/archive/%{commit}/kubernetes-%{shortcommit}.tar.gz
 Patch0:		No-Nicer-error-msg-if-stdlib-pkg-with-cgo-flag-is-no.patch
 
+Obsoletes:      cadvisor
+
 %if 0%{?fedora} >= 21 || 0%{?rhel}
 Requires:	docker
 %else
@@ -361,6 +363,10 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
 %systemd_postun
 
 %changelog
+* Fri Apr 17 2015 jchaloup <jchaloup at redhat.com> - 0.15.0-3
+- Obsolete cadvisor as it is integrated in kubelet
+  related: #1211266
+
 * Wed Apr 15 2015 jchaloup <jchaloup at redhat.com> - 0.15.0-0.2.git0ea87e4
 - Bump to upstream 0ea87e486407298dc1e3126c47f4076b9022fb09
   related: #1211266
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kubernetes.git/commit/?h=master&id=77b7cadb70b753686b038bd84f57cdbdedee0663