Prasanna-Padmanabhan · Prasanna-Padmanabhan · Jun 11, 2018 · Apr 11, 2018 · Apr 11, 2018 · Apr 11, 2018
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,8 +1,8 @@
-This checklist is used to make sure that common issues in a pull request are addressed. This will expedite the process of getting your pull request merged and avoid extra work on your part to fix issues discovered during the review process. 
+This checklist is used to make sure that common issues in a pull request are addressed. This will expedite the process of getting your pull request merged and avoid extra work on your part to fix issues discovered during the review process.
 
 ### PR information
 - [ ] The title of the PR is clear and informative.
-- [ ] There are a small number of commits, each of which have an informative message. This means that previously merged commits do not appear in the history of the PR. For information on cleaning up the commits in your pull request, [see this page](https://github.com/Azure/azure-powershell/blob/dev/documentation/cleaning-up-commits.md).
+- [ ] There are a small number of commits, each of which have an informative message. This means that previously merged commits do not appear in the history of the PR. For information on cleaning up the commits in your pull request, [see this page](https://github.com/Azure/azure-powershell/blob/master/documentation/development-docs/cleaning-up-commits.md).
 - [ ] Except for special cases involving multiple contributors, the PR is started from a fork of the main repository, not a branch.
 - [ ] If applicable, the PR references the bug/issue that it fixes.
 - [ ] Swagger files are correctly named (e.g. the `api-version` in the path should match the `api-version` in the spec).
@@ -11,5 +11,5 @@ This checklist is used to make sure that common issues in a pull request are add
 - [ ] I have read the [contribution guidelines](https://github.com/Azure/azure-rest-api-specs/blob/master/.github/CONTRIBUTING.md).
 - [ ] My spec meets the review criteria:
   - [ ] The spec conforms to the [Swagger 2.0 specification](https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md).
-  - [ ] The spec follows the guidelines described in the [Swagger checklist](../documentation/swagger-checklist.md) document.
-  - [ ] [Validation tools](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/swagger-checklist.md#validation-tools-for-swagger-checklist) were run on swagger spec(s) and have all been fixed in this PR. 
+  - [ ] The spec follows the guidelines described in the [Swagger checklist](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/swagger-checklist.md) document.
+  - [ ] [Validation tools](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/swagger-checklist.md#validation-tools-for-swagger-checklist) were run on swagger spec(s) and have all been fixed in this PR.
diff --git a/.gitignore b/.gitignore
@@ -59,7 +59,9 @@ Network Trash Folder
 Temporary Items
 .apdisk
 
+# npm
 node_modules
+package-lock.json
 
 #### JetBrains
 .idea

diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,7 @@ services:
   - docker
 env:
   matrix:
+    - MODE=branchStrategy
     - MODE=syntax
     - MODE=python
     - MODE=node
@@ -30,6 +31,7 @@ matrix:
     - env: MODE=azurebot PR_ONLY=true
     - env: MODE=liveValidation PR_ONLY=true
     - env: MODE=java
+    - env: MODE=ruby
     - env: MODE=go
     - env: MODE=node
 before_install:
@@ -52,20 +54,25 @@ script:
     fi
   - >-
     if [[ $MODE == 'node' ]]; then
-      $DOCKER_CMD Azure/azure-sdk-for-node -v
+      travis_wait 30 $DOCKER_CMD Azure/azure-sdk-for-node -v
     fi
   - >-
     if [[ $MODE == 'ruby' ]]; then
       $DOCKER_CMD Azure/azure-sdk-for-ruby -v
     fi
   - >-
     if [[ $MODE == 'go' ]]; then
-      $DOCKER_CMD Azure/azure-sdk-for-go -o dev -v
+      $DOCKER_CMD Azure/azure-sdk-for-go -o latest -v
     fi
   - >-
     if [[ $MODE == 'java' ]]; then
       $DOCKER_CMD Azure/azure-libraries-for-java -v
     fi
+  - >-
+    if [[ $MODE == 'branchStrategy' ]]; then
+      # Check to ensure CI is not executing for a PR against the master branch in the private repository
+      ! [[ $TRAVIS_PULL_REQUEST != 'false' && $TRAVIS_REPO_SLUG == 'Azure/azure-rest-api-specs-pr' && $TRAVIS_BRANCH == 'master' ]]
+    fi
   - >-
     if [[ $MODE == 'syntax' ]]; then
       npm test -- test/syntax.js
@@ -89,6 +96,7 @@ script:
   - >-
     if [[ $MODE == 'azurebot' ]]; then
       node scripts/momentOfTruth.js
+      node scripts/momentOfTruthPostProcessing.js
     fi
   - >-
     if [[ $MODE == 'liveValidation' ]]; then

diff --git a/CODEOWNERS b/CODEOWNERS
@@ -0,0 +1,72 @@
+/specification/analysisservices/ @taiwu
+/specification/apimanagement/ @promoisha @solankisamir
+/specification/applicationinsights/ @alexeldeib
+/specification/asazure/ @athipp
+/specification/authorization/ @darshanhs90 @stankovski
+/specification/automation/ @vrdmr
+/specification/azsadmin/ @deathly809
+/specification/batch/ @matthchr @xingwu1
+/specification/batchai/ @alexanderyukhanov
+/specification/billing/ @wilcobmsft
+/specification/cdn/ @csmengwan @injyzarif @prakharsharma10
+/specification/cognitiveservices/ @davidlicig @felixwa 
+/specification/compute/  @gatneil @huangpf @hyonholee 
+/specification/consumption/ @kjeur @panda-wang
+/specification/containerinstance/ @samkreter
+/specification/containerregistry/ @djyou
+/specification/containerservices/ @mboersma
+/specification/cosmos-db/ @dmakwana
+/specification/customer-insights/ @tjlvtao
+/specification/datafactory/ @zhangyd2015
+/specification/datalake-analytics/ @ro-joowan
+/specification/datalake-store/ @ro-joowan
+/specification/datamigration/ @hitenjava
+/specification/deploymentmanager/ @netrock
+/specification/devtestlabs/ @iouri-s
+/specification/dns/ @owolabi2
+/specification/documentdb/ @dmakwana
+/specification/domainservices/ @jihochang
+/specification/eventgrid/ @kalyanaj
+/specification/eventhub/ @v-ajnava
+/specification/features/ @stankovski
+/specification/graphrbac/ @stankovski
+/specification/hdinsight/ @pulkittomar @wawon-msft
+/specification/insights/ @gucalder
+/specification/intune/ @vrmurthy01
+/specification/iothub/ @rkmanda
+/specification/keyvault/ @schaabs
+/specification/logic/ @pankajsn @tonytang-microsoft-com
+/specification/machinelearning/ @nonstatic2014
+/specification/machinelearningcompute/ @shutchings
+/specification/managementpartner/ @jeffrey-ace
+/specification/mediaservices/ @brianblum
+/specification/mobileengagement/ @pshrosbree
+/specification/monitor/ @gucalder
+/specification/mysql/ @qingqingyuan
+/specification/network/ @deepakrajendranmsft @MikhailTryakhov 
+/specification/notificationhubs/ @amolr @smithab
+/specification/operationalinsights/ @sw47
+/specification/operationsmanagement/ @dashimi16
+/specification/policyinsights/ @bulentelmaci
+/specification/postgresql/ @qingqingyuan
+/specification/provisioningservices/ @kvish
+/specification/recoveryservices/ @dragonfly91 @sonathan
+/specification/recoveryservicesbackup/ @dheerendrarathor
+/specification/recoveryservicessiterecovery/ @avneeshrai
+/specification/redis/ @siddharthchatrolams @timlovellsmith
+/specification/relay/ @sethmanheim @v-ajnava
+/specification/resources/ @rajshah11 @stankovski @vivsriaus
+/specification/scheduler/ @pinwang81
+/specification/search/ @brjohnstmsft
+/specification/service-map/ @daveirwin1
+/specification/servicebus/ @sazeesha @v-ajnava
+/specification/servicefabric/ @juhacket @samedder
+/specification/sql/ @dnayantara @jaredmoo @nathannfan
+/specification/storage/ @jasonyang-msft @stankovski
+/specification/storageimportexport/ @leoz-ms
+/specification/storsimple8000series/ @manaas-microsoft
+/specification/streamanalytics/ @atpham256
+/specification/subscriptions/ @stankovski
+/specification/timeseriesinsights/ @sandshadow
+/specification/trafficmanager/ @allencal @hrkulkarmsft
+/specification/web/ @lukaszstem @naveedaz @nking92
diff --git a/README.md b/README.md
@@ -33,17 +33,19 @@ The structure of the directory should strictly follow these rules:
 
 1. **Profile**: The profile holder contains the profiles' definition MD files. these files will contain information and references to the snapshots of the RPs' Resource types or Dataplane API versions that represent a specific profile.
 
-2. **Specification**: This folder the is root folder for all Specs (Management and Dataplane) related docs.
+1. **Specification**: This folder the is root folder for all Specs (Management and Dataplane) related docs.
 
-3. **<RP-Name>** Folders - each RP will have a separate folder
+1. **{RP-Name} Folders** - each RP will have a separate folder
 
-4. **'resource-manager' and 'data-plane' Folders**: the RPs can put specs in one of two categories: `resource-manager` (for ARM resources) and `data-plane` (for everything else) . The autorest configuration file (`readme.md`) for the RP should be inside this folder
+1. **'resource-manager' and 'data-plane' Folders**: the RPs can put specs in one of two categories: `resource-manager` (for ARM resources) and `data-plane` (for everything else) . The autorest configuration file (`readme.md`) for the RP should be inside this folder
 
-4. **API versions**: this folder will be the direct child of the category folder. there will be one such folder per resource type or dataplane service version. This folder will contain the OpenAPI validation Specs (Swaggers previously) and the examples folder.
+1. **'preview' and 'stable' Folders**: Varying levels of stability exist in our repository. Each API Version folder should be categorized as either still accepting breaking changes, or no longer accepting breaking changes. This is not a direct analog for whether or not an API Version has the "-preview" suffix or not. SDKs that are generated from 'preview' folder items should indicate to their customers in the most idiomatic way that breaking changes may still be coming.
 
-6. **Examples**: the example folder will contain the x-ms-examples files. it will reside under the APIs or Resources' version folders as different APIs or Resource types version can have different examples.
+1. **API versions**: this folder will be the direct child of the category folder. there will be one such folder per resource type or dataplane service version. This folder will contain the OpenAPI validation Specs (Swaggers previously) and the examples folder.
 
-7. **Notes**:
+1. **Examples**: the example folder will contain the x-ms-examples files. it will reside under the APIs or Resources' version folders as different APIs or Resource types version can have different examples.
+
+1. **Notes**:
     - folder names should be singular (ie, 'profile' not 'profiles' ) -- this removes ambiguity for some non-english speakers.
     - generic folder names should be lower-case
     - proper-name/product name/namespace folders can be PascalCased (ie, "KeyVault")
@@ -57,31 +59,37 @@ The structure should appear like so:
 |    +---automation
 |    |   \---resource-manager
 |    |       \---Microsoft.Automation
-|    |           \---2015-10-31
-|    |               \---examples
+|    |           \---stable
+|    |               \---2015-10-31
+|    |                   \---examples
 |    +---batch
 |    |   +---data-plane
 |    |   |   \---Microsoft.Batch
-|    |   |       +---2015-12-01.2.2
-|    |   |       +---2016-02-01.3.0
-|    |   |       +---2016-07-01.3.1
-|    |   |       +---2017-01-01.4.0
-|    |   |       |   \---examples
-|    |   |       \---2017-05-01.5.0
+|    |   |       +---stable
+|    |   |       |   +---2015-12-01.2.2
+|    |   |       |   +---2016-02-01.3.0
+|    |   |       |   +---2016-07-01.3.1
+|    |   |       |   +---2017-01-01.4.0
+|    |   |       |       \---examples
+|    |   |       \---preview
+|    |   |           \---2017-05-01.5.0
 |    |   \---resource-manager
 |    |       \---Microsoft.Batch
-|    |           +---2015-12-01
-|    |           +---2017-01-01
-|    |           |   \---examples
+|    |           +---stable
+|    |           |   +---2015-12-01
+|    |           |   +---2017-01-01
+|    |           |       \---examples
 |    |           \---2017-05-01
 |    |               \---examples
 |    +---billing
 |        \---resource-manager
 |            \---Microsoft.Billing
-|                +---2017-02-27-preview
-|                |   \---examples
-|                \---2017-04-24-preview
-|                    \---examples
+|                \---stable
+|                |   +---2017-02-27-preview
+|                |       \---examples
+|                +---preview
+|                    \---2017-04-24-preview
+|                        \---examples
 \--- readme.md
 ```
 

diff --git a/arm-compute/quickstart-templates/aliases.json b/arm-compute/quickstart-templates/aliases.json
@@ -32,7 +32,7 @@
           "openSUSE-Leap": {
             "publisher":"SUSE",
             "offer":"openSUSE-Leap",
-            "sku":"42.2",
+            "sku":"42.3",
             "version": "latest"
           },
           "RHEL":{