1. docker
  2. Commit f44aa3b1fbe5e042fee0fb78507ebac35eca3d04
Browse code

for 1.6

Signed-off-by: Mary Anthony <mary@docker.com>

Mary Anthony authored on 2015/04/17 03:33:49
Showing 2 changed files
docs/Dockerfile
History View file @ f44aa3b
... ... 
@@ -6,9 +6,9 @@ MAINTAINER Sven Dowideit <SvenDowideit@docker.com> (@SvenDowideit)
6 6
7 7 
 # This section ensures we pull the correct version of each
8 8 
 # sub project
9 
-ENV COMPOSE_BRANCH release
10 
-ENV SWARM_BRANCH v0.1.0
11 
-ENV MACHINE_BRANCH v0.1.0
9 
+ENV COMPOSE_BRANCH 1.2.0
10 
+ENV SWARM_BRANCH v0.2.0
11 
+ENV MACHINE_BRANCH master
12 12 
 ENV DISTRIB_BRANCH master
13 13
14 14
docs/s3_website.json
History View file @ f44aa3b
... ... 
@@ -42,7 +42,8 @@
42 42 
     { "Condition": { "KeyPrefixEquals": "installation/openSUSE/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "installation/SUSE/" } },
43 43 
     { "Condition": { "KeyPrefixEquals": "contributing/contributing/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "project/who-written-for/" } },
44 44 
     { "Condition": { "KeyPrefixEquals": "contributing/devenvironment/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "project/set-up-prereqs/" } },
45 
-    { "Condition": { "KeyPrefixEquals": "contributing/docs_style-guide/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "project/doc-style/" } }
45 
+    { "Condition": { "KeyPrefixEquals": "contributing/docs_style-guide/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "project/doc-style/" } },
46 
+    { "Condition": { "KeyPrefixEquals": "registry/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "registry/overview/" } }
46 47 
   ]
47 48 
 }
48 49