jchaloup pushed to cadvisor (f20). "Remove wrong option in cadvisor.service (..more)"

[notifications at fedoraproject.org]

>From 82bf29e910eeabb69ceb51565433c7f2d563bd0d Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup at redhat.com>
Date: Thu, 9 Apr 2015 16:37:10 +0200
Subject: Remove wrong option in cadvisor.service - resolves: #1210336


diff --git a/cadvisor.service b/cadvisor.service
index c465783..36b15f0 100644
--- a/cadvisor.service
+++ b/cadvisor.service
@@ -6,7 +6,6 @@ EnvironmentFile=/etc/sysconfig/cadvisor
 ExecStart=/usr/bin/cadvisor \
 	--docker=${CADVISOR_DOCKER_ENDPOINT} \
 	--port=${CADVISOR_PORT} \
-	--samples=${CADVISOR_SAMPLES} \
 	--storage_driver=${CADVISOR_STORAGE_DRIVER} \
 	--storage_driver_host=${CADVISOR_STORAGE_DRIVER_HOST} \
 	--storage_driver_password=${CADVISOR_STORAGE_DRIVER_PASSWORD} \
diff --git a/cadvisor.spec b/cadvisor.spec
index 98bf3b3..74aafe7 100644
--- a/cadvisor.spec
+++ b/cadvisor.spec
@@ -10,7 +10,7 @@
 
 Name:		%{repo}
 Version:	0.10.1
-Release:	0.1.git%{shortcommit}%{?dist}
+Release:	2%{?dist}
 Summary:	Analyzes resource usage and performance characteristics of running containers
 License:	ASL 2.0
 URL:		https://%{import_path}
@@ -204,6 +204,10 @@ done
 %{gopath}/src/%{import_path}/utils/*
 
 %changelog
+* Thu Apr 09 2015 jchaloup <jchaloup at redhat.com> - 0.10.1-2
+- Remove wrong option in cadvisor.service
+  resolves: #1210336
+
 * Mon Mar 30 2015 jchaloup <jchaloup at redhat.com> - 0.10.1-0.1.gitef7dddf
 - Update to 0.10.1
 - Add debug info
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/cadvisor.git/commit/?h=f20&id=82bf29e910eeabb69ceb51565433c7f2d563bd0d