From 3a8aa7337453a9e14467af6b83fdb0670c9b1be9 Mon Sep 17 00:00:00 2001 From: josh-nw Date: Fri, 24 Jul 2015 14:37:50 -0400 Subject: [PATCH 01/13] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 774d4829..90185dde 100644 --- a/README.md +++ b/README.md @@ -10,3 +10,5 @@ Apache 2.0 ## Copyright Copyright Docker Inc Education Team 2014 + +this is an edit! From b24ae12cdeec1be3c292d4c0fec86fb9fb4b6bdd Mon Sep 17 00:00:00 2001 From: josh-nw Date: Tue, 28 Jul 2015 15:12:49 -0700 Subject: [PATCH 02/13] Update README.md --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 90185dde..774d4829 100644 --- a/README.md +++ b/README.md @@ -10,5 +10,3 @@ Apache 2.0 ## Copyright Copyright Docker Inc Education Team 2014 - -this is an edit! From e593e444de54b51093186fcb5e9f2d9b83de739b Mon Sep 17 00:00:00 2001 From: josh-nw Date: Tue, 28 Jul 2015 15:14:50 -0700 Subject: [PATCH 03/13] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 774d4829..4edfdf0a 100644 --- a/README.md +++ b/README.md @@ -9,4 +9,4 @@ Apache 2.0 ## Copyright -Copyright Docker Inc Education Team 2014 +Copyright Docker Inc Education Team 2014 --- not me From bf9ce666eb9e4c9b8c11977e6aa1346538509114 Mon Sep 17 00:00:00 2001 From: josh-nw Date: Fri, 31 Jul 2015 14:58:00 -0700 Subject: [PATCH 04/13] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 467873f5..3f160b55 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM ubuntu:14.04 -MAINTAINER Docker Education Team +MAINTAINER this is a change RUN apt-get update RUN DEBIAN_FRONTEND=noninteractive apt-get install -y -q python-all python-pip ADD ./webapp/requirements.txt /tmp/requirements.txt From 06abb2d9b69bd5bccf27ceca4d9fac3aefcfedf9 Mon Sep 17 00:00:00 2001 From: josh-nw Date: Mon, 10 Aug 2015 12:35:40 -0700 Subject: [PATCH 05/13] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4edfdf0a..774d4829 100644 --- a/README.md +++ b/README.md @@ -9,4 +9,4 @@ Apache 2.0 ## Copyright -Copyright Docker Inc Education Team 2014 --- not me +Copyright Docker Inc Education Team 2014 From 59664acef38247166dbc4290afa8d5231aed2c62 Mon Sep 17 00:00:00 2001 From: josh-nw Date: Mon, 10 Aug 2015 14:43:20 -0700 Subject: [PATCH 06/13] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 774d4829..8e53c5cf 100644 --- a/README.md +++ b/README.md @@ -9,4 +9,4 @@ Apache 2.0 ## Copyright -Copyright Docker Inc Education Team 2014 +Copyright Docker Inc Education Team 2014 --this change to my code. From 9fd503bf9cc50b26bfc6e54901b44a96e2d48583 Mon Sep 17 00:00:00 2001 From: josh-nw Date: Fri, 18 Sep 2015 01:00:29 -0700 Subject: [PATCH 07/13] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8e53c5cf..c780d4e7 100644 --- a/README.md +++ b/README.md @@ -9,4 +9,6 @@ Apache 2.0 ## Copyright -Copyright Docker Inc Education Team 2014 --this change to my code. +Copyright Docker Inc Education Team 2014 + +_New change_ From 95d8dce218297f115155d6e5e9bcca1f90c7d3fc Mon Sep 17 00:00:00 2001 From: josh-nw Date: Wed, 18 Nov 2015 01:08:11 -0600 Subject: [PATCH 08/13] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c780d4e7..40620166 100644 --- a/README.md +++ b/README.md @@ -11,4 +11,4 @@ Apache 2.0 Copyright Docker Inc Education Team 2014 -_New change_ +##Old change! From ced41eb0e76ce913bc267b56f54598989a1fc5cb Mon Sep 17 00:00:00 2001 From: josh-nw Date: Wed, 18 Nov 2015 08:00:04 -0600 Subject: [PATCH 09/13] Update app.py --- webapp/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/app.py b/webapp/app.py index 1bca36aa..c409ba0c 100644 --- a/webapp/app.py +++ b/webapp/app.py @@ -6,7 +6,7 @@ @app.route('/') def hello(): - provider = str(os.environ.get('PROVIDER', 'world')) + provider = str(os.environ.get('PROVIDER', 'josh')) return 'Hello '+provider+'!' if __name__ == '__main__': From 795707741ccfe0702f3cdc0d286aa16aec51ea0a Mon Sep 17 00:00:00 2001 From: josh-nw Date: Wed, 18 Nov 2015 08:03:15 -0600 Subject: [PATCH 10/13] Update tests.py --- webapp/tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/tests.py b/webapp/tests.py index 5d8e558f..b49150a3 100644 --- a/webapp/tests.py +++ b/webapp/tests.py @@ -8,7 +8,7 @@ class AppTestCase(unittest.TestCase): def test_root_text(self): tester = app.test_client(self) response = tester.get('/') - assert 'Hello world!' in response.data + assert 'Hello josh!' in response.data if __name__ == '__main__': unittest.main() From a935f08b0f00987485c52659b40c6cb0842f009b Mon Sep 17 00:00:00 2001 From: josh-nw Date: Wed, 18 Nov 2015 11:02:59 -0600 Subject: [PATCH 11/13] Update app.py --- webapp/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/app.py b/webapp/app.py index c409ba0c..1bca36aa 100644 --- a/webapp/app.py +++ b/webapp/app.py @@ -6,7 +6,7 @@ @app.route('/') def hello(): - provider = str(os.environ.get('PROVIDER', 'josh')) + provider = str(os.environ.get('PROVIDER', 'world')) return 'Hello '+provider+'!' if __name__ == '__main__': From a2c51157ba98fbbddaf98a945b3a9da218f077c1 Mon Sep 17 00:00:00 2001 From: josh-nw Date: Wed, 18 Nov 2015 11:04:03 -0600 Subject: [PATCH 12/13] Update tests.py --- webapp/tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/tests.py b/webapp/tests.py index b49150a3..5d8e558f 100644 --- a/webapp/tests.py +++ b/webapp/tests.py @@ -8,7 +8,7 @@ class AppTestCase(unittest.TestCase): def test_root_text(self): tester = app.test_client(self) response = tester.get('/') - assert 'Hello josh!' in response.data + assert 'Hello world!' in response.data if __name__ == '__main__': unittest.main() From bb152f973dd065e0e94fc1a8e81450427808848d Mon Sep 17 00:00:00 2001 From: josh-nw Date: Sun, 13 Dec 2015 16:58:09 -0800 Subject: [PATCH 13/13] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 40620166..39b0b0d5 100644 --- a/README.md +++ b/README.md @@ -11,4 +11,4 @@ Apache 2.0 Copyright Docker Inc Education Team 2014 -##Old change! +##Trivial Change!