diff --git a/.WALinuxAgent.metadata b/.WALinuxAgent.metadata index 70f09a7..cd51e12 100644 --- a/.WALinuxAgent.metadata +++ b/.WALinuxAgent.metadata @@ -1 +1 @@ -2bfb5473dddf2d87f959cc2ca6ae856a8aa13446 SOURCES/WALinuxAgent-2.2.4.tar.gz +a9e512cfbb548d2bc2ef9d8e26bc03eef81b3a67 SOURCES/WALinuxAgent-2.2.10.tar.gz diff --git a/.gitignore b/.gitignore index 5ce205d..4b17f1e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/WALinuxAgent-2.2.4.tar.gz +SOURCES/WALinuxAgent-2.2.10.tar.gz diff --git a/SOURCES/0002-Disable-autoupdate.patch b/SOURCES/0002-Disable-autoupdate.patch deleted file mode 100644 index 2c69291..0000000 --- a/SOURCES/0002-Disable-autoupdate.patch +++ /dev/null @@ -1,25 +0,0 @@ -From cb83841b57b2d5f3f8a24cec4a6e9bc246bd15f8 Mon Sep 17 00:00:00 2001 -From: Miroslav Rezanina -Date: Mon, 16 Jan 2017 17:40:12 +0100 -Subject: Disable autoupdate - ---- - config/waagent.conf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/config/waagent.conf b/config/waagent.conf -index 8a69462..77a0c7e 100644 ---- a/config/waagent.conf -+++ b/config/waagent.conf -@@ -86,7 +86,7 @@ OS.OpensslPath=None - # OS.EnableRDMA=y - - # Enable or disable goal state processing auto-update, default is enabled --# AutoUpdate.Enabled=y -+AutoUpdate.Enabled=n - - # Determine the update family, this should not be changed - # AutoUpdate.GAFamily=Prod --- -1.8.3.1 - diff --git a/SOURCES/0003-No-auto-update-when-upgrading.patch b/SOURCES/0003-No-auto-update-when-upgrading.patch deleted file mode 100644 index ab85d0a..0000000 --- a/SOURCES/0003-No-auto-update-when-upgrading.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7e555748e2ad77da55d84d7be59a0c527f72ea2f Mon Sep 17 00:00:00 2001 -From: Miroslav Rezanina -Date: Mon, 16 Jan 2017 17:41:35 +0100 -Subject: No auto update when upgrading - ---- - azurelinuxagent/common/conf.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/azurelinuxagent/common/conf.py b/azurelinuxagent/common/conf.py -index 7911699..c45ec96 100644 ---- a/azurelinuxagent/common/conf.py -+++ b/azurelinuxagent/common/conf.py -@@ -219,7 +219,7 @@ def get_autoupdate_gafamily(conf=__conf__): - - - def get_autoupdate_enabled(conf=__conf__): -- return conf.get_switch("AutoUpdate.Enabled", True) -+ return conf.get_switch("AutoUpdate.Enabled", False) - - - def get_autoupdate_frequency(conf=__conf__): --- -1.8.3.1 - diff --git a/SPECS/WALinuxAgent.spec b/SPECS/WALinuxAgent.spec index 225e330..bd2b074 100644 --- a/SPECS/WALinuxAgent.spec +++ b/SPECS/WALinuxAgent.spec @@ -1,6 +1,6 @@ %define name WALinuxAgent -%define version 2.2.4 -%define unmangled_version 2.2.4 +%define version 2.2.10 +%define unmangled_version 2.2.10 %define release 1 %if 0%{?rhel} < 7 @@ -13,9 +13,7 @@ Summary: UNKNOWN Name: %{name} Version: %{version} Release: %{release}%{?dist} -Source0: WALinuxAgent-2.2.4.tar.gz -Patch2: 0002-Disable-autoupdate.patch -Patch3: 0003-No-auto-update-when-upgrading.patch +Source0: WALinuxAgent-2.2.10.tar.gz License: Apache License Version 2.0 Group: Development/Libraries @@ -70,8 +68,6 @@ images that are built to run in the Azure environment. %prep %setup -n %{name}-%{unmangled_version} -n %{name}-%{unmangled_version} -%patch2 -p1 -%patch3 -p1 %build python setup.py build @@ -120,6 +116,16 @@ fi %defattr(-,root,root) %changelog +* Wed Apr 26 2017 Miroslav Rezanina - 2.2.4-10.el7 +- Rebase to 2.2.10 [bz#1443425] +- Resolves: bz#1443425 + ([WALA]Request to package WALA 2.2.10 into RHEL 7 Repo) + +* Wed Apr 19 2017 Miroslav Rezanina - 2.2.4-2.el7 +- Enable AutoUpdate by default [bz#1434933] +- Resolves: bz#1434933 + ([WALA][RHEL-7] Enable AutoUpdate by default) + * Wed Mar 01 2017 Miroslav Rezanina - 2.2.4-1.el7 - Rebase to 2.2.4 [bz#1419201] - resolves: bz#1419201