Resolving merge conflicts in Brad's PR MicrosoftDocs#2722

DanielLanger · Dec 16, 2016 · 307ed83 · 307ed83
2 parents a0a781b + 6be8728
commit 307ed83
Show file tree

Hide file tree

Showing 39 changed files with 80 additions and 78 deletions.
diff --git a/...cles/machine-learning/cortana-analytics-playbook-vehicle-telemetry-deep-dive.md b/...cles/machine-learning/cortana-analytics-playbook-vehicle-telemetry-deep-dive.md
diff --git a/articles/machine-learning/cortana-analytics-playbook-vehicle-telemetry-powerbi.md b/articles/machine-learning/cortana-analytics-playbook-vehicle-telemetry-powerbi.md
@@ -13,7 +13,7 @@ ms.workload: data-services
 ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: article
-ms.date: 09/12/2016
+ms.date: 12/09/2016
 ms.author: bradsev
 
 ---

diff --git a/articles/machine-learning/cortana-analytics-playbook-vehicle-telemetry.md b/articles/machine-learning/cortana-analytics-playbook-vehicle-telemetry.md
@@ -13,7 +13,7 @@ ms.workload: data-services
 ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: article
-ms.date: 12/16/2016
+ms.date: 12/09/2016
 ms.author: bradsev
 
 ---

diff --git a/articles/machine-learning/machine-learning-custom-r-modules.md b/articles/machine-learning/machine-learning-custom-r-modules.md
@@ -13,7 +13,7 @@ ms.devlang: na
 ms.topic: article
 ms.tgt_pltfrm: na
 ms.workload: tbd
-ms.date: 08/19/2016
+ms.date: 12/09/2016
 ms.author: bradsev;ankarlof
 
 ---

diff --git a/articles/machine-learning/machine-learning-data-science-move-azure-blob.md b/articles/machine-learning/machine-learning-data-science-move-azure-blob.md
@@ -13,7 +13,7 @@ ms.workload: data-services
 ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: article
-ms.date: 09/14/2016
+ms.date: 12/09/2016
 ms.author: bradsev;sachouks
 
 ---

diff --git a/...les/machine-learning/machine-learning-data-science-process-sqldw-walkthrough.md b/...les/machine-learning/machine-learning-data-science-process-sqldw-walkthrough.md
@@ -13,7 +13,7 @@ ms.workload: data-services
 ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: article
-ms.date: 06/24/2016
+ms.date: 12/09/2016
 ms.author: bradsev;hangzh;weig
 
 ---

diff --git a/articles/machine-learning/machine-learning-data-science-vm-do-ten-things.md b/articles/machine-learning/machine-learning-data-science-vm-do-ten-things.md
@@ -13,7 +13,7 @@ ms.workload: data-services
 ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: article
-ms.date: 08/29/2016
+ms.date: 12/09/2016
 ms.author: gokuma;weig;bradsev
 
 ---

diff --git a/...ive/fig2-vehicle-telematics-simulator.png → ...ive/fig1-vehicle-telematics-simulator.png b/...ive/fig2-vehicle-telematics-simulator.png → ...ive/fig1-vehicle-telematics-simulator.png
diff --git a/...ematics-partition-car-events-workflow.png → ...ematics-partition-car-events-workflow.png b/...ematics-partition-car-events-workflow.png → ...ematics-partition-car-events-workflow.png
diff --git a/...ematics-partition-car-events-pipeline.png → ...ematics-partition-car-events-pipeline.png b/...ematics-partition-car-events-pipeline.png → ...ematics-partition-car-events-pipeline.png
diff --git a/...vehicle-telematics-partitioned-output.png → ...vehicle-telematics-partitioned-output.png b/...vehicle-telematics-partitioned-output.png → ...vehicle-telematics-partitioned-output.png
diff --git a/...lytics-query-for-real-time-processing.png → ...lytics-query-for-real-time-processing.png b/...lytics-query-for-real-time-processing.png → ...lytics-query-for-real-time-processing.png
diff --git a/...stream-analytics-query-for-publishing.png → ...stream-analytics-query-for-publishing.png b/...stream-analytics-query-for-publishing.png → ...stream-analytics-query-for-publishing.png
diff --git a/...le-telematics-powerbi-dashboard-setup.png → ...le-telematics-powerbi-dashboard-setup.png b/...le-telematics-powerbi-dashboard-setup.png → ...le-telematics-powerbi-dashboard-setup.png
diff --git a/...elematics-realtimedashboardapp-folder.png → ...elematics-realtimedashboardapp-folder.png b/...elematics-realtimedashboardapp-folder.png → ...elematics-realtimedashboardapp-folder.png
diff --git a/...altimedashboardapp-sign-in-to-powerbi.png → ...altimedashboardapp-sign-in-to-powerbi.png b/...altimedashboardapp-sign-in-to-powerbi.png → ...altimedashboardapp-sign-in-to-powerbi.png
diff --git a/...altimedashboardapp-sign-in-to-powerbi.png → ...altimedashboardapp-sign-in-to-powerbi.png b/...altimedashboardapp-sign-in-to-powerbi.png → ...altimedashboardapp-sign-in-to-powerbi.png
diff --git a/...telematics-aggressive-driving-pattern.png → ...telematics-aggressive-driving-pattern.png b/...telematics-aggressive-driving-pattern.png → ...telematics-aggressive-driving-pattern.png
diff --git a/...ics-aggressive-driving-pattern-output.png → ...ics-aggressive-driving-pattern-output.png b/...ics-aggressive-driving-pattern-output.png → ...ics-aggressive-driving-pattern-output.png
diff --git a/...matics-fuel-efficient-driving-pattern.png → ...matics-fuel-efficient-driving-pattern.png b/...matics-fuel-efficient-driving-pattern.png → ...matics-fuel-efficient-driving-pattern.png
diff --git a/...dive/fig3-vehicle-telemetry-blueprint.png → ...dive/fig2-vehicle-telemetry-blueprint.png b/...dive/fig3-vehicle-telemetry-blueprint.png → ...dive/fig2-vehicle-telemetry-blueprint.png
diff --git a/...fuel-efficient-driving-pattern-output.png → ...fuel-efficient-driving-pattern-output.png b/...fuel-efficient-driving-pattern-output.png → ...fuel-efficient-driving-pattern-output.png
diff --git a/...-telematics-machine-learning-endpoint.png → ...-telematics-machine-learning-endpoint.png b/...-telematics-machine-learning-endpoint.png → ...-telematics-machine-learning-endpoint.png
diff --git a/...-vehicle-telematics-aml-batch-scoring.png → ...-vehicle-telematics-aml-batch-scoring.png b/...-vehicle-telematics-aml-batch-scoring.png → ...-vehicle-telematics-aml-batch-scoring.png
diff --git a/...elematics-pipeline-predicting-recalls.png → ...elematics-pipeline-predicting-recalls.png b/...elematics-pipeline-predicting-recalls.png → ...elematics-pipeline-predicting-recalls.png
diff --git a/...matics-detect-anamoly-pipeline-output.png → ...matics-detect-anamoly-pipeline-output.png b/...matics-detect-anamoly-pipeline-output.png → ...matics-detect-anamoly-pipeline-output.png
diff --git a/...lytics-job-publishes-output-event-hub.png → ...lytics-job-publishes-output-event-hub.png b/...lytics-job-publishes-output-event-hub.png → ...lytics-job-publishes-output-event-hub.png
diff --git a/...lytics-query-publish-output-event-hub.png → ...lytics-query-publish-output-event-hub.png b/...lytics-query-publish-output-event-hub.png → ...lytics-query-publish-output-event-hub.png
diff --git a/...-processing-results-copy-to-data-mart.png → ...-processing-results-copy-to-data-mart.png b/...-processing-results-copy-to-data-mart.png → ...-processing-results-copy-to-data-mart.png
diff --git a/...-analytics-job-publishes-to-data-mart.png → ...-analytics-job-publishes-to-data-mart.png b/...-analytics-job-publishes-to-data-mart.png → ...-analytics-job-publishes-to-data-mart.png
diff --git a/...-mart-setting-in-stream-analytics-job.png → ...-mart-setting-in-stream-analytics-job.png b/...-mart-setting-in-stream-analytics-job.png → ...-mart-setting-in-stream-analytics-job.png
diff --git a/...4-vehicle-telematics-simulator-folder.png → ...3-vehicle-telematics-simulator-folder.png b/...4-vehicle-telematics-simulator-folder.png → ...3-vehicle-telematics-simulator-folder.png
diff --git a/...-vehicle-telematics-powerbi-dashboard.png → ...-vehicle-telematics-powerbi-dashboard.png b/...-vehicle-telematics-powerbi-dashboard.png → ...-vehicle-telematics-powerbi-dashboard.png
diff --git a/...ehicle-telematics-event-hub-dashboard.png → ...ehicle-telematics-event-hub-dashboard.png b/...ehicle-telematics-event-hub-dashboard.png → ...ehicle-telematics-event-hub-dashboard.png
diff --git a/...-stream-analytics-job-processing-data.png → ...-stream-analytics-job-processing-data.png b/...-stream-analytics-job-processing-data.png → ...-stream-analytics-job-processing-data.png
diff --git a/...nalytics-job-query-for-data-ingestion.png → ...nalytics-job-query-for-data-ingestion.png b/...nalytics-job-query-for-data-ingestion.png → ...nalytics-job-query-for-data-ingestion.png
diff --git a/...pare-sample-data-for-batch-processing.png → ...pare-sample-data-for-batch-processing.png b/...pare-sample-data-for-batch-processing.png → ...pare-sample-data-for-batch-processing.png
diff --git a/...lematics-prepare-sample-data-pipeline.png → ...lematics-prepare-sample-data-pipeline.png b/...lematics-prepare-sample-data-pipeline.png → ...lematics-prepare-sample-data-pipeline.png
diff --git a/...s-prepare-sample-data-pipeline-output.png → ...s-prepare-sample-data-pipeline-output.png b/...s-prepare-sample-data-pipeline-output.png → ...s-prepare-sample-data-pipeline-output.png