Resolving merge conflict in wxi by taking from source (dev)

Author: dragonfly91

ChangeLog.txt

@@ -1,16 +1,97 @@
-2015.07.10 version 1.0.0
+2015.07.16 version 0.9.5
+* Azure RedisCache cmdlets 
+    * Set-AzureRedisCache - Bug fix done in management API that fixes bug here as well
+* Azure Network Resource Provider cmdlets
+    * Added Application Gateway cmdlets
+        * New-AzureApplicationGateway
+        * Start-AzureApplicationGateway
+        * Stop-AzureApplicationGateway
+        * SetAzureApplicationGateway
+        * GetAzureApplicationGateway
+        * RemoveAzureApplicationGateway
+    * Added Application Gateway Backend Address Pool cmdlets
+        * New-AzureApplicationGatewayBackendAddressPool
+        * Add-AzureApplicationGatewayBackendAddressPool
+        * Set-AzureApplicationGatewayBackendAddressPool
+        * Get-AzureApplicationGatewayBackendAddressPool
+        * Remove-AzureApplicationGatewayBackendAddressPool
+    * Added Application Gateway Backend HTTP Settings cmdlets
+        * New-AzureApplicationGatewayBackendHttpSettings
+        * Add-AzureApplicationGatewayBackendHttpSettings
+        * Set-AzureApplicationGatewayBackendHttpSettings
+        * Get-AzureApplicationGatewayBackendHttpSettings
+        * Remove-AzureApplicationGatewayBackendHttpSettings
+    * Added Application Gateway Frontend IP Configuration cmdlets
+        * New-AzureApplicationGatewayFrontendIPConfiguration
+        * Add-AzureApplicationGatewayFrontendIPConfiguration
+        * Set-AzureApplicationGatewayFrontendIPConfiguration
+        * Get-AzureApplicationGatewayFrontendIPConfiguration
+        * Remove-AzureApplicationGatewayFrontendIPConfiguration
+    * Added Application Gateway Frontend Port cmdlets
+        * New-AzureApplicationGatewayFrontendPort
+        * Add-AzureApplicationGatewayFrontendPort
+        * Set-AzureApplicationGatewayFrontendPort
+        * Get-AzureApplicationGatewayFrontendPort
+        * Remove-AzureApplicationGatewayFrontendPort
+    * Added Application Gateway IP Configuration cmdlets
+        * New-AzureApplicationGatewayGatewayIPConfiguration
+        * Add-AzureApplicationGatewayGatewayIPConfiguration
+        * Set-AzureApplicationGatewayGatewayIPConfiguration
+        * Get-AzureApplicationGatewayGatewayIPConfiguration
+        * Remove-AzureApplicationGatewayGatewayIPConfiguration
+    * Added Application Gateway HTTP Listener cmdlets
+        * New-AzureApplicationGatewayHttpListener
+        * Add-AzureApplicationGatewayHttpListener
+        * Set-AzureApplicationGatewayHttpListener
+        * Get-AzureApplicationGatewayHttpListener
+        * Remove-AzureApplicationGatewayHttpListener
+    * Added Application Gateway Request Routing Rule cmdlets
+        * New-AzureApplicationGatewayRequestRoutingRule
+        * Add-AzureApplicationGatewayRequestRoutingRule
+        * Set-AzureApplicationGatewayRequestRoutingRule
+        * Get-AzureApplicationGatewayRequestRoutingRule
+        * Remove-AzureApplicationGatewayRequestRoutingRule
+    * Added Application Gateway SKU cmdlets
+        * New-AzureApplicationGatewaySku
+        * Set-AzureApplicationGatewaySku
+        * Get-AzureApplicationGatewaySku
+    * Added Application Gateway SSL Certificate cmdlets
+        * New-AzureApplicationGatewaySslCertificate
+        * Add-AzureApplicationGatewaySslCertificate
+        * Set-AzureApplicationGatewaySslCertificate
+        * Get-AzureApplicationGatewaySslCertificate
+        * Remove-AzureApplicationGatewaySslCertificate
+	* Fixed minor bugs AzureLoadbalancer 
+	* Renamed Get-AzureCheckDnsAvailablity to Test-AzureDnsAvailability
+	* Added cmdlets to RouteTables and Routes
+		* New-AzureRouteTable
+		* Get-AzureRouteTable
+		* Set-AzureRouteTable
+		* Remove-AzureRouteTable
+		* New-AzureRouteConfig
+		* Add-AzureRouteConfig
+		* Set-AzureRouteConfig
+		* Get-AzureRouteConfig
+		* Remove-AzureRouteConfig
+	*Azure Network cmdlets
+		* Reserved IP cmdlets (New-AzureReservedIP, Get-AzureReservedIP, Set-AzureReservedIPAssociation, Remove-AzureReservedIPAssociation) fixed to support -VirtualIPName parameter
+		* Multivip Cmdlets (Add-AzureVirtualIP, Remove-AzureVirtualIP) fixed to support -VirtualIPName parameter
+
+2015.07.10 version 1.0.0
 * Azure Backup cmdlets
     *Added New-AzureBackupVault cmdlets
     *Added Get-AzureBackupVault cmdlets
     *Added Set-AzureBackupVault cmdlets
     *Added Remove-AzureBackupVault cmdlets
     *Added Get-AzureBackupVaultCredential cmdlets
-
-2015.07.16 version 0.9.5
 * Azure Resource Manager cmdlets
     * Fixed formatting of output for Get-UsageAggregates
     * Fixed executing Get-UsageAggregates when first cmdlet being called.
 
+* Azure Data Factory cmdlets
+    * Upgraded management library to 1.0.0 with breaking JSON format change.
+    * Updated list operation paging support in cmdlets.
+
 2015.06.26 version 0.9.4
 * Azure Compute cmdlets
     * Warning message for deprecation Name parameter in New-AzureVM. The guidance is to use –Name parameter in New-AzureVMConfig cmdlet.