From e44c98ad051f79ec3965dc5abb9019b9fa856289 Mon Sep 17 00:00:00 2001
From: Elastic Jasper <elastic-jasper@users.noreply.github.com>
Date: Mon, 27 Jun 2016 15:32:58 -0400
Subject: [PATCH] Backport PR #7546 ---------

**Commit 1:**
[tests] Remove _timestamp mapping from fixtures

* Original sha: 36a88bc165d79588bf98ca550bcb522c7ce9a595
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-06-24T16:36:22Z
---
 .../scenarios/logstash_functional/makelogs_index_definition.js | 3 ---
 test/fixtures/scenarios/makelogs/makelogs_index_definition.js  | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/test/fixtures/scenarios/logstash_functional/makelogs_index_definition.js b/test/fixtures/scenarios/logstash_functional/makelogs_index_definition.js
index 95b416ea852f0..baf0e5f938b07 100644
--- a/test/fixtures/scenarios/logstash_functional/makelogs_index_definition.js
+++ b/test/fixtures/scenarios/logstash_functional/makelogs_index_definition.js
@@ -33,9 +33,6 @@ module.exports = {
           'match': '*'
         }
       }],
-      '_timestamp': {
-        'enabled': true
-      },
       'properties': {
         '@timestamp': {
           'type': 'date'
diff --git a/test/fixtures/scenarios/makelogs/makelogs_index_definition.js b/test/fixtures/scenarios/makelogs/makelogs_index_definition.js
index 95b416ea852f0..baf0e5f938b07 100644
--- a/test/fixtures/scenarios/makelogs/makelogs_index_definition.js
+++ b/test/fixtures/scenarios/makelogs/makelogs_index_definition.js
@@ -33,9 +33,6 @@ module.exports = {
           'match': '*'
         }
       }],
-      '_timestamp': {
-        'enabled': true
-      },
       'properties': {
         '@timestamp': {
           'type': 'date'