From 78d42440e5540a573f2f069a0012030578738359 Mon Sep 17 00:00:00 2001
From: V <vlemp@vuksan.com>
Date: Mon, 17 Dec 2018 13:40:12 -0500
Subject: [PATCH] Bump to version 1.0.26

---
 Release-Notes.md                                           | 6 ++++++
 VERSION                                                    | 2 +-
 app/code/community/Fastly/CDN/Helper/Cache.php             | 2 +-
 app/code/community/Fastly/CDN/etc/config.xml               | 2 +-
 app/code/community/Fastly/CDN/etc/vcl_snippets/deliver.vcl | 2 +-
 composer.json                                              | 2 +-
 6 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Release-Notes.md b/Release-Notes.md
index 3ba2b65..1e348a7 100644
--- a/Release-Notes.md
+++ b/Release-Notes.md
@@ -1,5 +1,11 @@
 # Fastly_Cdn Release Notes
 
+
+## 1.0.26
+
+- Change sales_order_view to sales_order_ to handle all routes https://github.com/fastly/fastly-magento/pull/46
+- Fix ESI include path, fix translate warnings https://github.com/fastly/fastly-magento/pull/45
+
 ## 1.0.25
 
 - Minor VCL changes
diff --git a/VERSION b/VERSION
index 4a4127c..8955a01 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.25
+1.0.26
diff --git a/app/code/community/Fastly/CDN/Helper/Cache.php b/app/code/community/Fastly/CDN/Helper/Cache.php
index c89cce9..9b8c348 100755
--- a/app/code/community/Fastly/CDN/Helper/Cache.php
+++ b/app/code/community/Fastly/CDN/Helper/Cache.php
@@ -245,7 +245,7 @@ public static function setTtlHeader($ttl)
         // This page potentially has ESIs so as a first cut let's mark it as such
         $response->setHeader("X-Esi", "1");
 
-        $response->setHeader("Fastly-Module-Enabled", "1.0.25", true);
+        $response->setHeader("Fastly-Module-Enabled", "1.0.26", true);
     }
 
     /**
diff --git a/app/code/community/Fastly/CDN/etc/config.xml b/app/code/community/Fastly/CDN/etc/config.xml
index 4bb5225..5fa7171 100755
--- a/app/code/community/Fastly/CDN/etc/config.xml
+++ b/app/code/community/Fastly/CDN/etc/config.xml
@@ -23,7 +23,7 @@
 <config>
     <modules>
         <Fastly_CDN>
-            <version>1.0.25</version>
+            <version>1.0.26</version>
         </Fastly_CDN>
     </modules>
     <global>
diff --git a/app/code/community/Fastly/CDN/etc/vcl_snippets/deliver.vcl b/app/code/community/Fastly/CDN/etc/vcl_snippets/deliver.vcl
index 5f8b4ec..9dd1a74 100644
--- a/app/code/community/Fastly/CDN/etc/vcl_snippets/deliver.vcl
+++ b/app/code/community/Fastly/CDN/etc/vcl_snippets/deliver.vcl
@@ -1,6 +1,6 @@
     # Add an easy way to see whether custom Fastly VCL has been uploaded
     if ( req.http.Fastly-Debug ) {
-        set resp.http.Fastly-Magento-VCL-Uploaded = "1.0.25";
+        set resp.http.Fastly-Magento-VCL-Uploaded = "1.0.26";
     } else {
         remove resp.http.Fastly-Module-Enabled;
         # remove Varnish/proxy header
diff --git a/composer.json b/composer.json
index d9b8368..3a51e13 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
     "type": "magento-module",
     "license": "BSD-3-Clause",
     "description":"Fastly CDN module for Magento 1.x",
-    "version": "1.0.25",
+    "version": "1.0.26",
     "authors":[
         {
             "name":"Fastly",