From 544146df6175294339d6138a8ecbeb54149a5dd7 Mon Sep 17 00:00:00 2001 From: Justin Simonelis Date: Wed, 26 Mar 2014 10:24:16 -0400 Subject: [PATCH 1/3] typo fix Upstream-commit: 61f7d967ed635098abaf42fc411866bb198b97c5 Component: engine --- components/engine/docs/sources/reference/builder.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/docs/sources/reference/builder.rst b/components/engine/docs/sources/reference/builder.rst index 1c8331e98f..6462512da0 100644 --- a/components/engine/docs/sources/reference/builder.rst +++ b/components/engine/docs/sources/reference/builder.rst @@ -49,7 +49,7 @@ to be created - so ``RUN cd /tmp`` will not have any effect on the next instructions. Whenever possible, Docker will re-use the intermediate images, -accelerating ``docker build`` significantly (indicated by ``Using cache``: +accelerating ``docker build`` significantly (indicated by ``Using cache``): .. code-block:: bash From 27a67b3ba583826f3abeed6ddf1354d3bfff70ac Mon Sep 17 00:00:00 2001 From: Justin Simonelis Date: Wed, 26 Mar 2014 10:30:57 -0400 Subject: [PATCH 2/3] authors update Upstream-commit: 72dc19fd7d339321a347dce4ea39d59fd503a4cc Component: engine --- components/engine/AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/components/engine/AUTHORS b/components/engine/AUTHORS index df091d5950..1c58d953f6 100644 --- a/components/engine/AUTHORS +++ b/components/engine/AUTHORS @@ -170,6 +170,7 @@ Julien Barbier Julien Dubois Justin Force Justin Plock +Justin Simonelis Karan Lyons Karl Grzeszczak Kawsar Saiyeed From de2c049dbe1b40ab33c7131d6a9042d745dfbdd9 Mon Sep 17 00:00:00 2001 From: Justin Simonelis Date: Fri, 28 Mar 2014 15:15:54 -0500 Subject: [PATCH 3/3] Update AUTHORS Upstream-commit: 7d750180e49159ead712843a9cc1c0c58fd5c53c Component: engine --- components/engine/AUTHORS | 1 - 1 file changed, 1 deletion(-) diff --git a/components/engine/AUTHORS b/components/engine/AUTHORS index 1c58d953f6..df091d5950 100644 --- a/components/engine/AUTHORS +++ b/components/engine/AUTHORS @@ -170,7 +170,6 @@ Julien Barbier Julien Dubois Justin Force Justin Plock -Justin Simonelis Karan Lyons Karl Grzeszczak Kawsar Saiyeed