From e592cdf8fc1be6dbc50efe920e5ac6dcf50c3fae Mon Sep 17 00:00:00 2001 From: Troy Loftus Date: Fri, 28 Jul 2017 11:07:06 -0700 Subject: [PATCH 1/3] Fixed main menu --- labs/End to End Workflow-Eclipse.md | 2 +- labs/readme.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/labs/End to End Workflow-Eclipse.md b/labs/End to End Workflow-Eclipse.md index b4fb3ff..de09c52 100644 --- a/labs/End to End Workflow-Eclipse.md +++ b/labs/End to End Workflow-Eclipse.md @@ -127,7 +127,7 @@ In this task you will create a branch of the code to fix the Bug. You will then ![Link the new branch to the work item](images/e2e-eclipse/linkbranch.png "Link the new branch to the work item") -1. In the project view, browse to src/main/java/com.microsoft.example.servlet and open the LoginServlet class. +1. Return to Eclipse. In the project view, browse to src/main/java/com.microsoft.example.servlet and open the LoginServlet class. 1. Around line 35, you will see what is causing the bug: the `totalDriverFee` is being calculated but the `driverFeeTotal` session attribute is being set to `totalFareForDriver` (this looks like a classic copy/paste error). diff --git a/labs/readme.md b/labs/readme.md index 1c3d549..adb3b65 100644 --- a/labs/readme.md +++ b/labs/readme.md @@ -31,7 +31,7 @@ The labs should be followed in the following order, though there are some equiva 1. [Build Docker containers with VSTS](Build%20Docker%20containers%20with%20VSTS.md) 1. (Optional) [Managing Technical Debt with SonarQube and VSTS Team Build](Managing%20Technical%20Debt%20with%20SonarQube%20and%20VSTS%20Team%20Build.md) 1. [Release Management with VSTS](Release%20Management%20with%20VSTS.md) -1. (Optional) [Release Containers to ACS Kubernetes with VSTS](Release%20Containers%20to%20ACS%20Kubernetes%20with%20VSTS.md) (not complete - submit a pull request!) +1. (Optional) [Release Containers to ACS Kubernetes with VSTS](Release%20Containers%20to%20ACS%20Kubernetes%20with%20VSTS.md) 1. Either: 1. [End to End Workflow - IntelliJ](End%20to%20End%20Workflow-IntelliJ.md) 1. [End to End Workflow - Eclipse](End%20to%20End%20Workflow-Eclipse.md) (not complete - submit a pull request!) \ No newline at end of file From 2eb876c003045adae249700d89f52025d9a8a209 Mon Sep 17 00:00:00 2001 From: Troy Loftus Date: Fri, 28 Jul 2017 11:09:24 -0700 Subject: [PATCH 2/3] Fix lab readme again --- labs/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/labs/readme.md b/labs/readme.md index adb3b65..5cff31a 100644 --- a/labs/readme.md +++ b/labs/readme.md @@ -31,7 +31,7 @@ The labs should be followed in the following order, though there are some equiva 1. [Build Docker containers with VSTS](Build%20Docker%20containers%20with%20VSTS.md) 1. (Optional) [Managing Technical Debt with SonarQube and VSTS Team Build](Managing%20Technical%20Debt%20with%20SonarQube%20and%20VSTS%20Team%20Build.md) 1. [Release Management with VSTS](Release%20Management%20with%20VSTS.md) -1. (Optional) [Release Containers to ACS Kubernetes with VSTS](Release%20Containers%20to%20ACS%20Kubernetes%20with%20VSTS.md) +1. (Optional) [Release Containers to ACS Kubernetes with VSTS](Release%20Containers%20to%20ACS%20Kubernetes%20with%20VSTS.md) (not complete - submit a pull request!) 1. Either: 1. [End to End Workflow - IntelliJ](End%20to%20End%20Workflow-IntelliJ.md) - 1. [End to End Workflow - Eclipse](End%20to%20End%20Workflow-Eclipse.md) (not complete - submit a pull request!) \ No newline at end of file + 1. [End to End Workflow - Eclipse](End%20to%20End%20Workflow-Eclipse.md) \ No newline at end of file From deaac7e97f9ae64e0d07c5c65e074809921779ad Mon Sep 17 00:00:00 2001 From: Troy Loftus Date: Fri, 28 Jul 2017 11:21:29 -0700 Subject: [PATCH 3/3] Remove Kubernetes from readme --- labs/readme.md | 1 - 1 file changed, 1 deletion(-) diff --git a/labs/readme.md b/labs/readme.md index 5cff31a..a710e47 100644 --- a/labs/readme.md +++ b/labs/readme.md @@ -31,7 +31,6 @@ The labs should be followed in the following order, though there are some equiva 1. [Build Docker containers with VSTS](Build%20Docker%20containers%20with%20VSTS.md) 1. (Optional) [Managing Technical Debt with SonarQube and VSTS Team Build](Managing%20Technical%20Debt%20with%20SonarQube%20and%20VSTS%20Team%20Build.md) 1. [Release Management with VSTS](Release%20Management%20with%20VSTS.md) -1. (Optional) [Release Containers to ACS Kubernetes with VSTS](Release%20Containers%20to%20ACS%20Kubernetes%20with%20VSTS.md) (not complete - submit a pull request!) 1. Either: 1. [End to End Workflow - IntelliJ](End%20to%20End%20Workflow-IntelliJ.md) 1. [End to End Workflow - Eclipse](End%20to%20End%20Workflow-Eclipse.md) \ No newline at end of file