Merge branch 'upstream-master' into ds-select-addons

Azure · Nov 11, 2017 · 7654abc · 7654abc
2 parents 2479519 + af32b52
commit 7654abc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/parts/masterparams.t b/parts/masterparams.t
@@ -95,7 +95,7 @@
       "type": "string"
     }, 
     "osImageSKU": {
-      "defaultValue": "16.04-DAILY-LTS",
+      "defaultValue": "16.04-LTS",
       "metadata": {
         "description": "OS image SKU."
       },

diff --git a/pkg/acsengine/defaults.go b/pkg/acsengine/defaults.go
@@ -50,7 +50,7 @@ var (
 	//DefaultUbuntuImageConfig is the default Linux distribution.
 	DefaultUbuntuImageConfig = AzureOSImageConfig{
 		ImageOffer:     "UbuntuServer",
-		ImageSku:       "16.04-DAILY-LTS",
+		ImageSku:       "16.04-LTS",
 		ImagePublisher: "Canonical",
 		ImageVersion:   "16.04.201710110",
 	}