Azure
diff --git a/‎.github/comment.yml
Lines changed: 0 additions & 1 deletion b/‎.github/comment.yml
Lines changed: 0 additions & 1 deletion
diff --git a/‎.github/pull_request_assignment.yml
Lines changed: 10 additions & 2 deletions b/‎.github/pull_request_assignment.yml
Lines changed: 10 additions & 2 deletions
diff --git a/‎CODEOWNERS
Lines changed: 6 additions & 3 deletions b/‎CODEOWNERS
Lines changed: 6 additions & 3 deletions
diff --git a/‎custom-words.txt
Lines changed: 14 additions & 1 deletion b/‎custom-words.txt
Lines changed: 14 additions & 1 deletion
diff --git a/‎documentation/code-gen/configure-python-sdk.md
Lines changed: 18 additions & 17 deletions b/‎documentation/code-gen/configure-python-sdk.md
Lines changed: 18 additions & 17 deletions
diff --git a/‎documentation/samplefiles/readme.python.md
Lines changed: 23 additions & 3 deletions b/‎documentation/samplefiles/readme.python.md
Lines changed: 23 additions & 3 deletions
diff --git a/‎specification/adp/resource-manager/readme.az.md
Lines changed: 6 additions & 0 deletions b/‎specification/adp/resource-manager/readme.az.md
Lines changed: 6 additions & 0 deletions
diff --git a/‎specification/adp/resource-manager/readme.cli.md
Lines changed: 0 additions & 9 deletions b/‎specification/adp/resource-manager/readme.cli.md
Lines changed: 0 additions & 9 deletions
diff --git a/‎specification/applicationinsights/data-plane/Monitor.Exporters/preview/2020-09-15_Preview/swagger.json
Lines changed: 1 addition & 1 deletion b/‎specification/applicationinsights/data-plane/Monitor.Exporters/preview/2020-09-15_Preview/swagger.json
Lines changed: 1 addition & 1 deletion
diff --git a/‎specification/azurestackhci/resource-manager/Microsoft.AzureStackHCI/stable/2020-10-01/azurestackhci.json
Lines changed: 6 additions & 0 deletions b/‎specification/azurestackhci/resource-manager/Microsoft.AzureStackHCI/stable/2020-10-01/azurestackhci.json
Lines changed: 6 additions & 0 deletions
@@ -56,5 +56,4 @@
       - "update existing version to fix swagger quality issue in s360"
     onCheckedLabels:
       - FixS360
-    onCheckedComments: "In the Window Period to fix mismatches between swagger and service,  when PR is labelled with “FixS360”, breaking change can be approved by PR assignee; the Azure Breaking Change Board is no longer required to approve the PR.  Please ensure to clarify what s360 action items to be solved, and @ mention PR assignee for awareness.  Please check this wiki [Window to Fix Broken](https://dev.azure.com/azure-sdk/internal/_wiki/wikis/internal.wiki/405/Window-to-Fix-Broken) for more details."
 
@@ -1,4 +1,12 @@
 ---
+- rule:
+    # translator data-plane PR
+    paths:
+      - "specification/cognitiveservices/data-plane/TranslatorText/**"
+    reviewers:
+      - kristapratico
+      - maririos
+
 - rule:
     # eventgrid data-plane PR
     paths:
@@ -37,7 +45,7 @@
       - kairu-ms
 
 - rule:
-    paths: "specification/@(resources|powerplatform|appplatform)/**"
+    paths: "specification/@(resources|powerplatform|appplatform|deviceupdate)/**"
     reviewers:
       - raych1
 
@@ -149,7 +157,7 @@
     paths:
       - "specification/servicelinker/**"
     reviewers:
-      - PhoenixHe-msft
+      - raych1
 
 - rule:
     paths: 
 
@@ -79,6 +79,9 @@
 /specification/trafficmanager/ @allencal @hrkulkarmsft
 /specification/web/ @naveedaz @Azure/azure-app-service-control-plane
 /profile/ @shahabhijeet
-/specification/**/readme.typescript.md @qiaozha
-/specification/**/readme.go.md @ArcturusZhang
-/specification/**/readme.python.md @jsntcy @msyyc
+/specification/**/resource-manager/**/readme.typescript.md @qiaozha
+/specification/**/resource-manager/**/readme.az.md @jsntcy @qiaozha
+/specification/**/resource-manager/**/readme.cli.md @jsntcy @qiaozha
+/specification/**/resource-manager/**/readme.go.md @ArcturusZhang
+/specification/**/resource-manager/**/readme.python.md @jsntcy @msyyc
+/specification/**/resource-manager/**/readme.azureresourceschema.md @leni-msft
@@ -505,10 +505,15 @@ deserializer
 deserializing
 destinationshares
 deterministically
+deviceclasses
 devicecredentials
 devicegroups
+deviceids
 deviceprovisioningservices
+devicestates
+devicetags
 devicetemplates
+deviceupdate
 Devops
 devops
 devspaces
@@ -824,6 +829,8 @@ innererror
 inotify
 Inotify
 Inprogress
+installable
+installableupdates
 integrationaccount
 Intelli
 intervaled
@@ -1044,6 +1051,7 @@ metricdefinitions
 metricmetadata
 metricnames
 metricnamespace
+metricsadvisor
 metrictype
 mgmt
 Mibps
@@ -1116,6 +1124,7 @@ mypath
 mypicture
 mypictures
 myregistry
+myscope
 myshopify
 mysite
 mysquare
@@ -1160,6 +1169,7 @@ nodeagentskus
 nodeconfiguration
 nodecounts
 Nodeploy
+nodetool
 nodrm
 nometadata
 nonadmin
@@ -1461,6 +1471,7 @@ Reregister
 Rescan
 reservationorders
 resetapikey
+resetconnection
 resetvpnclientsharedkey
 Resolvability
 resourcegraph
@@ -1910,6 +1921,7 @@ Untracked
 unvalidated
 unwrapkey
 updatecertificate
+updatecompliance
 updatehostname
 updatepolicy
 updateprivateendpointconnection
@@ -2103,4 +2115,5 @@ lifecycles
 backuptype
 FSLogix
 privatelinkservice
-natgateway
+natgateway
+defanged
@@ -122,6 +122,18 @@ python:
   clear-output-folder: true
 ```
 
+``` yaml $(python-mode) == 'update' && !$(track2)
+python:                                     
+  no-namespace-folders: true
+  output-folder: $(python-sdks-folder)/appconfiguration/azure-mgmt-appconfiguration/azure/mgmt/appconfiguration
+```
+
+``` yaml $(python-mode) == 'create' && !$(track2)
+python:
+  basic-setup-py: true
+  output-folder: $(python-sdks-folder)/appconfiguration/azure-mgmt-appconfiguration
+```
+
 These settings apply only when `--track2` is specified on the command line.
 
 ``` yaml $(track2)                          // For track2: basic Python package information 
@@ -132,20 +144,12 @@ no-namespace-folders: true
 package-version: 0.1.0
 ```
 
-``` yaml $(python-mode) == 'update'
-// --------------- For track1 -----------------
-python:                                     
-  no-namespace-folders: true
-  output-folder: $(python-sdks-folder)/appconfiguration/azure-mgmt-appconfiguration/azure/mgmt/appconfiguration
-
-// --------------- For track2 -----------------
+``` yaml $(python-mode) == 'update' && $(track2)
 no-namespace-folders: true
 output-folder: $(python-sdks-folder)/appconfiguration/azure-mgmt-appconfiguration/azure/mgmt/appconfiguration
 ```
-``` yaml $(python-mode) == 'create'
-python:
-  basic-setup-py: true
-  output-folder: $(python-sdks-folder)/appconfiguration/azure-mgmt-appconfiguration
+
+``` yaml $(python-mode) == 'create' && $(track2)
 basic-setup-py: true
 output-folder: $(python-sdks-folder)/appconfiguration/azure-mgmt-appconfiguration
 ```
@@ -180,7 +184,7 @@ batch:
   - multiapiscript: true
 ```
 
-``` yaml $(multiapiscript)                  // For track2
+``` yaml $(multiapiscript) && $(track2)      // For track2
 output-folder: $(python-sdks-folder)/compute/azure-mgmt-compute/azure/mgmt/compute/
 clear-output-folder: false
 perform-load: false
@@ -197,12 +201,9 @@ Then, the output folder and namespace should be configured for each of the tag.
 These settings apply only when `--tag=package-2020-06-01-only --python` is specified on the command line.
 Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.
 
-``` yaml $(tag) == 'package-2020-06-01-only'
+``` yaml $(tag) == 'package-2020-06-01-only' && $(track2)      // For track2
 namespace: azure.mgmt.compute.v2020_06_01
 output-folder: $(python-sdks-folder)/compute/azure-mgmt-compute/azure/mgmt/compute/v2020_06_01
-python:
-  namespace: azure.mgmt.compute.v2020_06_01
-  output-folder: $(python-sdks-folder)/compute/azure-mgmt-compute/azure/mgmt/compute/v2020_06_01
 ```
 ~~~
 
@@ -235,5 +236,5 @@ Track 2 is based on the latest AutoRest code generator
 
 ~~~
 > autorest --reset
-> autorest --python --track2 --use=@autorest/python@5.3.0 --python-sdks-folder=..\azure-sdk-for-python\sdk --multiapi --python-mode=update  ..\azure-rest-api-specs\specification\appconfiguration\resource-manager\readme.md
+> autorest --python --track2 --use=@autorest/python@5.4.1 --python-sdks-folder=..\azure-sdk-for-python\sdk --multiapi --python-mode=update  ..\azure-rest-api-specs\specification\appconfiguration\resource-manager\readme.md
 ~~~
@@ -3,19 +3,39 @@
 These settings apply only when `--python` is specified on the command line.
 Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.
 
-``` yaml $(python)
+``` yaml $(python) && !$(track2)
+python: 
+    azure-arm: true
+    license-header: MICROSOFT_MIT_NO_VERSION
+    package-name: azure-mgmt-[[ServiceName]]
+    no-namespace-folders: true
+    package-version: 1.0.0b1
+```
+
+``` yaml $(python-mode) == 'update' && !$(track2)
+python:
+    output-folder: $(python-sdks-folder)/[[ServiceName]]/azure-mgmt-[[ServiceName]]/azure/mgmt/[[ServiceName]]
+```
+``` yaml $(python-mode) == 'create' && !$(track2)
+python:
+    basic-setup-py: true
+    output-folder: $(python-sdks-folder)/[[ServiceName]]/azure-mgmt-[[ServiceName]]
+```
+
+``` yaml $(python) && $(track2)
 azure-arm: true
 license-header: MICROSOFT_MIT_NO_VERSION
 package-name: azure-mgmt-[[ServiceName]]
 no-namespace-folders: true
-package-version: 1.0.0b1
 ```
 
 ``` yaml $(python-mode) == 'update'
 no-namespace-folders: true
 output-folder: $(python-sdks-folder)/[[ServiceName]]/azure-mgmt-[[ServiceName]]/azure/mgmt/[[ServiceName]]
 ```
-``` yaml $(python-mode) == 'create'
+
+``` yaml $(python-mode) == 'create' && $(track2)
+package-version: 1.0.0b1
 basic-setup-py: true
 output-folder: $(python-sdks-folder)/[[ServiceName]]/azure-mgmt-[[ServiceName]]
 ```
@@ -9,4 +9,10 @@ az:
   package-name: azure-mgmt-adp
 az-output-folder: $(azure-cli-extension-folder)/src/adp
 python-sdk-output-folder: "$(az-output-folder)/azext_adp/vendored_sdks/adp"
+
+directive:
+- from: swagger-document
+  where: $.definitions.DataPoolLocation
+  transform: >
+    $.properties.encryption["x-ms-client-flatten"] = true;
 ```
@@ -1,12 +1,3 @@
 ## CLI
 
 These settings don't need to apply `--cli` on the command line.
-
-``` yaml
-cli:
-  cli-directive:
-    - where:
-        type: DataPoolLocation
-        prop: encryption
-      cli-flatten: true
-```
@@ -856,7 +856,7 @@
           "type": "number",
           "format": "float",
           "default": 100.0,
-          "description": "Sampling rate used in application. This telemetry item represents 1 / sampleRate actual telemetry items."
+          "description": "Sampling rate used in application. This telemetry item represents 100 / sampleRate actual telemetry items."
         },
         "seq": {
           "type": "string",
 
@@ -352,6 +352,12 @@
         }
       ],
       "properties": {
+        "systemData": {
+          "description": "System data of Cluster resource",
+          "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData",
+          "x-ms-client-flatten": true,
+          "readOnly": true
+        },
         "properties": {
           "description": "Cluster properties.",
           "$ref": "#/definitions/ClusterProperties",