Resolving conflicts

Author: sayghosh

LICENSE.txt

@@ -184,25 +184,44 @@ BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT
       incurred by, or claims asserted against, such Contributor by reason
       of your accepting any such warranty or additional liability.
 
--------------------END OF LICENSE-------------------------------
+-------------------END OF LICENSE------------------------------------------
 
-The software includes the AutoMapper library ("AutoMapper").  The MIT License set out below is provided for informational purposes only. It is not the license that governs any part of the software.
 
-----------------START OF LICENSE--------------------------------
+----------------START OF THIRD PARTY NOTICE--------------------------------
+
+
+The software includes the AutoMapper library ("AutoMapper").  The MIT License set out below is provided for informational purposes only. It is not the license that governs any part of the software.
 
 Provided for Informational Purposes Only
 
 AutoMapper
 
 The MIT License (MIT)
-
 Copyright (c) 2010 Jimmy Bogard
 
+
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
--------------END OF LICENSE----------------------------------------
+
+
+
+
+
+***************
+
+The software includes Newtonsoft.Json. The MIT License set out below is provided for informational purposes only. It is not the license that governs any part of the software.
+
+Newtonsoft.Json
+
+The MIT License (MIT)
+Copyright (c) 2007 James Newton-King
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-------------END OF THIRD PARTY NOTICE----------------------------------------
 

appveyor.yml

@@ -24,4 +24,4 @@ on_success:
   - cd %TEMP%\Azure
   - ps: ls C:\docs -dir | % { copy $_.FullName . -Recurse -Force }
   - git add -A
-  - git diff --quiet --exit-code --cached || git commit -m "Sync docs from source code repo to content repo." && git push origin %target_branch% -f && appveyor AddMessage "Content Updated"
+  - git diff --quiet --exit-code --cached || git commit -m "Sync docs from source code repo to content repo." && git push origin %source_branch%:%target_branch% -f && appveyor AddMessage "Content Updated"

documentation/development-docs/azure-powershell-design-guidelines.md

@@ -269,6 +269,8 @@ $job | Wait-Job
 $subcriptions = $job | Receive-Job
 ````
 
+To set a custom job name, please use [SetBackgroupJobDescription(string name)](https://github.com/Azure/azure-powershell/blob/preview/src/Common/Commands.Common/AzurePSCmdlet.cs#L761).  The default job description is: "Long Running Operation for '{cmdlet name}' on resource '{resource name}'"
+
 ## Argument Completers
 
 PowerShell uses Argument Completers to provide tab completion for users.  At the moment, Azure PowerShell has two specific argument completers that should be applied to relevant parameters, and one generic argument completer that can be used to tab complete with a given list of values.
@@ -307,4 +309,4 @@ using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 [Parameter(Mandatory = false, HelpMessage = "The tiers of the plan")]
 [PSArgumentCompleter("Basic", "Premium", "Elite")]
 public string Tier { get; set; }
-```
+```