From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 23 Nov 2015 00:28:41 +0000 (+0100)
Subject: pin ES==1
X-Git-Tag: 1.6b~7^2~48
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=60667982105fa93264c49ad7786a811e41f5ee4d;p=telemeta.git

pin ES==1
---

diff --git a/docker-compose.yml b/docker-compose.yml
index ef2c7bf8..68633642 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -51,7 +51,7 @@ rabbitmq:
     - "15672:15672"
 
 search:
-  image: elasticsearch
+  image: elasticsearch:1
 
 app:
   build: .
diff --git a/telemeta/locale b/telemeta/locale
index 91973b13..4534a3d4 160000
--- a/telemeta/locale
+++ b/telemeta/locale
@@ -1 +1 @@
-Subproject commit 91973b13f9dc9405052727c0c525d342dee15562
+Subproject commit 4534a3d47e7909554637e87a637b1959db277941
diff --git a/telemeta/pages b/telemeta/pages
index f8324093..771dfcc5 160000
--- a/telemeta/pages
+++ b/telemeta/pages
@@ -1 +1 @@
-Subproject commit f8324093174d077b674ac2c52eb0db6eaf815ab5
+Subproject commit 771dfcc58e26f43a507c3bc48fcb5ddde55ca0b1