Merge branch 'master' into vnext

MatthewMcGlynn · web-flow · commit 42584dbc2773 · 2017-04-06T00:53:51.000-07:00
diff --git a/Infrastructure/AzureStack.Infra.psm1 b/Infrastructure/AzureStack.Infra.psm1
@@ -738,8 +738,8 @@ Function Restart-AzSInfraRoleInstance{
 
     $subscription, $headers =  (Get-AzureStackAdminSubTokenHeader -TenantId $tenantId -AzureStackCredentials $azureStackCredentials -EnvironmentName $EnvironmentName)
     $URI= "${ArmEndpoint}/subscriptions/${subscription}/resourceGroups/system.$region/providers/Microsoft.Fabric.Admin/fabricLocations/$region/infraroleinstances/$name/reboot?api-version=2016-05-01"      
-    $PowerOff=Invoke-RestMethod -Method Post -Uri $uri -ContentType 'application/json' -Headers $Headers
-    $PowerOff
+    $Restart=Invoke-RestMethod -Method Post -Uri $uri -ContentType 'application/json' -Headers $Headers
+    $Restart
 }
 export-modulemember -function Restart-AzSInfraRoleInstance
 

Original file line number	Diff line number	Diff line change
`@@ -738,8 +738,8 @@ Function Restart-AzSInfraRoleInstance{`
`738`	`738`
`739`	`739`	`$subscription, $headers = (Get-AzureStackAdminSubTokenHeader -TenantId $tenantId -AzureStackCredentials $azureStackCredentials -EnvironmentName $EnvironmentName)`
`740`	`740`	`$URI= "${ArmEndpoint}/subscriptions/${subscription}/resourceGroups/system.$region/providers/Microsoft.Fabric.Admin/fabricLocations/$region/infraroleinstances/$name/reboot?api-version=2016-05-01"`
`741`		`- $PowerOff=Invoke-RestMethod -Method Post -Uri $uri -ContentType 'application/json' -Headers $Headers`
`742`		`- $PowerOff`
	`741`	`+ $Restart=Invoke-RestMethod -Method Post -Uri $uri -ContentType 'application/json' -Headers $Headers`
	`742`	`+ $Restart`
`743`	`743`	`}`
`744`	`744`	`export-modulemember -function Restart-AzSInfraRoleInstance`
`745`	`745`