From 83432149e212155469b1e9f06eb0095121377356 Mon Sep 17 00:00:00 2001
From: Ben Howard <ben.howard@ubuntu.com>
Date: Mon, 7 Dec 2015 16:48:51 -0700
Subject: Import patches-unapplied version 2.1.2-0ubuntu1 to
 ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: 04946cba49f19c0b6b876bccdbb36d47334af002

New changelog entries:
  * New upstream release (LP: #1523715):
    - Bug fixes for Ubuntu 15.10 on Azure
    - Enablement for Azure Stack
    - Dropped patch for systemd job as upstream now includes it.
---
 init/ubuntu/walinuxagent | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'init/ubuntu/walinuxagent')

diff --git a/init/ubuntu/walinuxagent b/init/ubuntu/walinuxagent
index a17174c..0253202 100644
--- a/init/ubuntu/walinuxagent
+++ b/init/ubuntu/walinuxagent
@@ -1,2 +1,2 @@
-# To disable the Windows Azure Agent, set WALINUXAGENT_ENABLED=0
+# To disable the Microsoft Azure Agent, set WALINUXAGENT_ENABLED=0
 WALINUXAGENT_ENABLED=1
-- 
cgit v1.2.3