From 7f82a2857264b4d0929c931c0ae6d6d318ce4bbd Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 26 Sep 2017 17:19:29 -0700
Subject: [PATCH] Revert 3.4-beta temp rename

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 ...nfig_schema_v3.4-beta.json => config_schema_v3.4.json} | 8 +++++---
 compose/const.py                                          | 2 +-
 docker-compose.spec                                       | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)
 rename compose/config/{config_schema_v3.4-beta.json => config_schema_v3.4.json} (98%)

diff --git a/compose/config/config_schema_v3.4-beta.json b/compose/config/config_schema_v3.4.json
similarity index 98%
rename from compose/config/config_schema_v3.4-beta.json
rename to compose/config/config_schema_v3.4.json
index cba063202..dae7d7d23 100644
--- a/compose/config/config_schema_v3.4-beta.json
+++ b/compose/config/config_schema_v3.4.json
@@ -1,6 +1,7 @@
+
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "id": "config_schema_v3.4-beta.json",
+  "id": "config_schema_v3.4.json",
   "type": "object",
   "required": ["version"],
 
@@ -316,7 +317,7 @@
       "additionalProperties": false,
       "properties": {
         "disable": {"type": "boolean"},
-        "interval": {"type": "string"},
+        "interval": {"type": "string", "format": "duration"},
         "retries": {"type": "number"},
         "test": {
           "oneOf": [
@@ -324,7 +325,8 @@
             {"type": "array", "items": {"type": "string"}}
           ]
         },
-        "timeout": {"type": "string"}
+        "timeout": {"type": "string", "format": "duration"},
+        "start_period": {"type": "string", "format": "duration"}
       }
     },
     "deployment": {
diff --git a/compose/const.py b/compose/const.py
index 809f7c7d4..b5970f82a 100644
--- a/compose/const.py
+++ b/compose/const.py
@@ -31,7 +31,7 @@ COMPOSEFILE_V3_0 = ComposeVersion('3.0')
 COMPOSEFILE_V3_1 = ComposeVersion('3.1')
 COMPOSEFILE_V3_2 = ComposeVersion('3.2')
 COMPOSEFILE_V3_3 = ComposeVersion('3.3')
-COMPOSEFILE_V3_4 = ComposeVersion('3.4-beta')
+COMPOSEFILE_V3_4 = ComposeVersion('3.4')
 
 API_VERSIONS = {
     COMPOSEFILE_V1: '1.21',
diff --git a/docker-compose.spec b/docker-compose.spec
index fe5651f6a..9c46421f0 100644
--- a/docker-compose.spec
+++ b/docker-compose.spec
@@ -63,8 +63,8 @@ exe = EXE(pyz,
                 'DATA'
             ),
             (
-                'compose/config/config_schema_v3.4-beta.json',
-                'compose/config/config_schema_v3.4-beta.json',
+                'compose/config/config_schema_v3.4.json',
+                'compose/config/config_schema_v3.4.json',
                 'DATA'
             ),
             (