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-auto-update.patch b/SOURCES/0002-Disable-auto-update.patch index abee60b..9d56bc3 100644 --- a/SOURCES/0002-Disable-auto-update.patch +++ b/SOURCES/0002-Disable-auto-update.patch @@ -1,8 +1,9 @@ -From 6b80e77324a56a8e7e4feb023c940603efb058f3 Mon Sep 17 00:00:00 2001 +From 711e2fa0a8909b59cc05bb9123d7eae46fa10124 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Wed, 8 Feb 2017 11:23:29 +0100 Subject: Disable auto update +(cherry picked from commit 6b80e77324a56a8e7e4feb023c940603efb058f3) --- config/waagent.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -21,5 +22,5 @@ index 8a69462..77a0c7e 100644 # Determine the update family, this should not be changed # AutoUpdate.GAFamily=Prod -- -1.8.3.1 +2.9.3 diff --git a/SOURCES/0003-Disable-auto-update-when-upgrading.patch b/SOURCES/0003-Disable-auto-update-when-upgrading.patch index c5eb9f5..55cc26f 100644 --- a/SOURCES/0003-Disable-auto-update-when-upgrading.patch +++ b/SOURCES/0003-Disable-auto-update-when-upgrading.patch @@ -1,8 +1,9 @@ -From d3f66f3aadf4c277a3b22182a0648d618e0fa2cb Mon Sep 17 00:00:00 2001 +From e71be24e77938a0c2873d5eec3ac742715c8abe5 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Wed, 8 Feb 2017 11:25:26 +0100 Subject: Disable auto update when upgrading +(cherry picked from commit d3f66f3aadf4c277a3b22182a0648d618e0fa2cb) --- azurelinuxagent/common/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -21,5 +22,5 @@ index 7911699..c45ec96 100644 def get_autoupdate_frequency(conf=__conf__): -- -1.8.3.1 +2.9.3 diff --git a/SPECS/WALinuxAgent.spec b/SPECS/WALinuxAgent.spec index 4c68671..c4d8bf2 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,7 +13,7 @@ Summary: UNKNOWN Name: %{name} Version: %{version} Release: %{release}%{?dist} -Source0: WALinuxAgent-2.2.4.tar.gz +Source0: WALinuxAgent-2.2.10.tar.gz Patch0002: 0002-Disable-auto-update.patch Patch0003: 0003-Disable-auto-update-when-upgrading.patch @@ -120,7 +120,12 @@ fi %defattr(-,root,root) %changelog -* Mon Mar 01 2017 Miroslav Rezanina - 2.2.4-1 +* Wed Apr 26 2017 Miroslav Rezanina - 2.2.10-1 +- Rebase to 2.2.10 [bz#1443427] +- Resolves: bz#1443427 + ([WALA]Request to package WALA 2.2.10 into RHEL 6 Repo) + +* Wed Mar 01 2017 Miroslav Rezanina - 2.2.4-1 - Rebase to 2.2.4 [bz#1419200] - Resolves: bz#1419200 WALA 2.2.4