Merge remote-tracking branch 'origin/MAGETWO-57477' into develop

# Conflicts: # etc/ce-to-ce/settings.xml.dist # etc/ce-to-ee/settings.xml.dist # etc/ee-to-ee/settings.xml.dist
magento · Aug 31, 2016 · e08afa1 · e08afa1
2 parents bcc5476 + af8d414
commit e08afa1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/etc/ce-to-ce/settings.xml.dist b/etc/ce-to-ce/settings.xml.dist
@@ -1045,10 +1045,9 @@
         <ignore>
             <path>design/theme/template_ua_regexp</path>
         </ignore>
-        <rename>
+        <ignore>
             <path>admin/security/session_cookie_lifetime</path>
-            <to>admin/security/session_lifetime</to>
-        </rename>
+        </ignore>
         <rename>
             <path>api/config/charset</path>
             <to>webapi/soap/charset</to>

diff --git a/etc/ce-to-ee/settings.xml.dist b/etc/ce-to-ee/settings.xml.dist
@@ -1045,10 +1045,9 @@
         <ignore>
             <path>design/theme/template_ua_regexp</path>
         </ignore>
-        <rename>
+        <ignore>
             <path>admin/security/session_cookie_lifetime</path>
-            <to>admin/security/session_lifetime</to>
-        </rename>
+        </ignore>
         <rename>
             <path>api/config/charset</path>
             <to>webapi/soap/charset</to>

diff --git a/etc/ee-to-ee/settings.xml.dist b/etc/ee-to-ee/settings.xml.dist
@@ -1090,10 +1090,9 @@
         <ignore>
             <path>design/theme/template_ua_regexp</path>
         </ignore>
-        <rename>
+        <ignore>
             <path>admin/security/session_cookie_lifetime</path>
-            <to>admin/security/session_lifetime</to>
-        </rename>
+        </ignore>
         <rename>
             <path>api/config/charset</path>
             <to>webapi/soap/charset</to>