Merge fixes from develop (#158)

srimathiS · vikasnav · commit 25533adc7471 · 2016-09-21T21:33:30.000-07:00
* Fixed jetstress Storage Endpoint api usage (#152) * Metadata.json fix for all the existing ones and newly created for Linux templates (#154) * Docker swarm compute resource apiversion fix (#157)
diff --git a/docker-swarm-ubuntu/azuredeploy.json b/docker-swarm-ubuntu/azuredeploy.json
@@ -620,7 +620,7 @@
             }
         },
         {
-            "apiVersion": "2015-05-01-preview",
+            "apiVersion": "2015-06-15",
             "type": "Microsoft.Compute/virtualMachines",
             "name": "[concat(variables('agentVMNamePrefix'), copyIndex())]",
             "location": "[resourceGroup().location]",

Original file line number	Diff line number	Diff line change
`@@ -620,7 +620,7 @@`
`620`	`620`	`}`
`621`	`621`	`},`
`622`	`622`	`{`
`623`		`- "apiVersion": "2015-05-01-preview",`
	`623`	`+ "apiVersion": "2015-06-15",`
`624`	`624`	`"type": "Microsoft.Compute/virtualMachines",`
`625`	`625`	`"name": "[concat(variables('agentVMNamePrefix'), copyIndex())]",`
`626`	`626`	`"location": "[resourceGroup().location]",`