Merge changes.txt conflicts

ruflin · Oct 4, 2014 · ff6e737 · ff6e737
2 parents a775593 + d9d60da
commit ff6e737
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,7 +12,7 @@ matrix:
 
 env:
   global:
-    - ES_VER=1.3.0
+    - ES_VER=1.3.4
     - ES_MAPPER_ATTACHMENTS_VER=2.0.0.RC1
     - ES_TRANSPORT_THRIFT_VER=2.0.0
     - ES_GEOCLUSTER_FACET_VER=0.0.10

diff --git a/changes.txt b/changes.txt
@@ -1,7 +1,10 @@
 CHANGES
 
+2014-10-04
+- Update to elasticsearch 1.3.4 #691
+
 2014-09-22
- - Update the branch alias in composer.json to match the library version
+ - Update the branch alias in composer.json to match the library version #683
 
 2014-09-16
  - Update license in composer.json to match project #681