From 3e7fccddaf9c20b3f2349e335bd6733916e3d2ed Mon Sep 17 00:00:00 2001
From: Paul Sanwald <paul.sanwald@elastic.co>
Date: Wed, 18 Apr 2018 07:42:05 -0700
Subject: [PATCH] Add a CHANGELOG file for release notes. (#29450)

* Add a CHANGELOG file for 7.x release notes.

* update file to include 6.x

* remove confusing comment and small edit to section title

* moving CHANGELOG file under docs directory, as it pertains to release notes.
---
 .gitattributes          |  1 +
 docs/CHANGELOG.asciidoc | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 .gitattributes
 create mode 100644 docs/CHANGELOG.asciidoc

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000000..0c4d2c9b20b
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+CHANGELOG.asciidoc  merge=union
diff --git a/docs/CHANGELOG.asciidoc b/docs/CHANGELOG.asciidoc
new file mode 100644
index 00000000000..9c6e36a2e1d
--- /dev/null
+++ b/docs/CHANGELOG.asciidoc
@@ -0,0 +1,38 @@
+// Use these for links to issue and pulls. Note issues and pulls redirect one to
+// each other on Github, so don't worry too much on using the right prefix.
+// :issue: https://github.com/elastic/elasticsearch/issues/
+// :pull: https://github.com/elastic/elasticsearch/pull/
+
+= Elasticsearch Release Notes
+
+== Elasticsearch 7.0.0
+
+=== Breaking Changes
+
+=== Breaking Java Changes
+
+=== Deprecations
+
+=== New Features 
+
+=== Enhancements
+
+=== Bug Fixes
+
+=== Regressions
+
+=== Known Issues
+
+== Elasticsearch version 6.3.0
+
+=== New Features 
+
+=== Enhancements
+
+=== Bug Fixes
+
+=== Regressions
+
+=== Known Issues
+
+