Import patches-unapplied version 2.0.13-0ubuntu1 to ubuntu/wily-proposed

Imported using git-ubuntu import.

Changelog parent: 5af8d1f80caf5d49988dbb0cf95ad7c58250b90f

New changelog entries:
  * New upstream release (LP: #1449369).
  * Rebased patches for 2.0.12 onto 2.0.13.

1 files changed, 47 insertions, 4 deletions

diff --git a/README b/README
index 6a5a2b7..59fab95 100644
--- a/README
+++ b/README
@@ -31,11 +31,11 @@ functionality for Linux and FreeBSD IaaS deployments:
 
   * SCVMM Deployments
     - Detect and bootstrap the VMM agent for Linux when running in a System
-	  Center Virtual Machine Manager 2012R2 environment
+      Center Virtual Machine Manager 2012R2 environment
 
   * VM Extension
     - Inject component authored by Microsoft and Partners into Linux VM (IaaS)
-	  to enable software and configuration automation
+      to enable software and configuration automation
     - VM Extension reference implementation on https://github.com/Azure/azure-linux-extensions
 
 
@@ -90,8 +90,32 @@ files provided (see debian/README and rpm/README).
 If installing manually, waagent should be copied to /usr/sbin/waagent and
 installed by running:
 
-	# sudo chmod 755 /usr/sbin/waagent
-	# sudo /usr/sbin/waagent -install -verbose
+    # sudo chmod 755 /usr/sbin/waagent
+    # sudo /usr/sbin/waagent -install -verbose
+
+The agent's log file is kept at /var/log/waagent.log.
+
+
+UPGRADE
+
+Upgrading via your distribution's package repository is preferred.
+
+If upgrading manually, same with installation above, waagent should be copied 
+to /usr/sbin/waagent to override original file and installed by running:
+
+    # sudo chmod 755 /usr/sbin/waagent
+
+Restart waagent service,for most of linux distributions:
+
+    #sudo service waagent restart
+
+For Ubuntu, use:
+
+    #sudo service walinuxagent restart
+
+For CoreOS, use:
+
+    #sudo systemctl restart waagent 
 
 The agent's log file is kept at /var/log/waagent.log.
 
@@ -171,6 +195,8 @@ Provisioning.DeleteRootPassword=n
 Provisioning.RegenerateSshHostKeyPair=y
 Provisioning.SshHostKeyPairType=rsa
 Provisioning.MonitorHostName=y
+Provisioning.DecodeCustomData=n
+Provisioning.ExecuteCustomData=n
 ResourceDisk.Format=y
 ResourceDisk.Filesystem=ext4
 ResourceDisk.MountPoint=/mnt/resource
@@ -180,6 +206,8 @@ LBProbeResponder=y
 Logs.Verbose=n
 OS.RootDeviceScsiTimeout=300
 OS.OpensslPath=None
+HttpProxy.Host=None
+HttpProxy.Port=None
 
 The various configuration options are described in detail below. Configuration
 options are of three types : Boolean, String or Integer. The Boolean
@@ -260,6 +288,16 @@ the image to reflect the change. In order to push the name change to the DNS
 servers, networking will be restarted in the VM. This will result in brief loss
 of Internet connectivity.
 
+Provisioning.DecodeCustomData:
+Type: Boolean Default: n
+
+If set, waagent will decode CustomData from Base64.
+
+Provisioning.ExecuteCustomData:
+Type: Boolean Default: n
+
+If set, waagent will execute CustomData after provisioning.
+
 ResourceDisk.Format:
 Type: Boolean Default: y
 
@@ -317,6 +355,11 @@ Type: String Default: None
 This can be used to specify an alternate path for the openssl binary to use for
 cryptographic operations.
 
+HttpProxy.Host=None
+HttpProxy.Port=None
+Type: String Default: None
+
+If set, agent will use proxy server to access internet
 
 APPENDIX