From cc1d96bf3f70a8e6af1e436a0283ef22b6af3dd2 Mon Sep 17 00:00:00 2001
From: Mathieu Martin <mathieu.martin@elastic.co>
Date: Thu, 22 Aug 2019 13:44:49 -0400
Subject: [PATCH] Cut 1.1.0 changelog, add contributor guidelines to
 changelog.next (#527)

---
 CHANGELOG.md      | 27 +++++++++++++++++++++++++++
 CHANGELOG.next.md | 20 +++++---------------
 2 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18ac81838f..7ac1b8ab1b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,30 @@
 All notable changes to this project will be documented in this file based on the [Keep a Changelog](http://keepachangelog.com/) Standard. This project adheres to [Semantic Versioning](http://semver.org/).
 
 
+## [1.1.0](https://github.com/elastic/ecs/compare/v1.0.1...v1.1.0)
+
+### Added
+
+* Added `as` fields for Autonomous System information (i.e. ASN). #341
+* Added field formats to all `.bytes` fields and `event.duration`. #385, #425
+* Added `hash.*` field set. #426
+* Added `dns.*` field set, to describe DNS traffic. #438
+* Added `event.code`, `event.sequence` and `event.provider`. #439
+* Added `file.name` and `file.directory`. #441
+* Added `file.created`, and `file.accessed`. #445
+* Added `process.uptime` and `host.uptime` fields. #477
+* Added `domain` field to user. #486
+* Added `.nat.ip` and `.nat.port` to `source`, `destination`, `client` and `server`. #491
+* Added `process.thread.name` field. #517
+* Added `trace.id` and `transaction.id` fields for tracing across different services. #519
+* Added `log.logger` field. #521
+
+### Improvements
+
+* Added examples and improved definitions of many `file` fields. #441
+* Changed the `service.id` description so it works better for clustered services. #502
+
+
 ## [1.0.1](https://github.com/elastic/ecs/compare/v1.0.0...v1.0.1)
 
 ### Added
@@ -20,6 +44,7 @@ All notable changes to this project will be documented in this file based on the
 * Format port numbers and numeric IDs as strings. #454
 * Add example for `process.pid` and `process.ppid`. #464, #470
 
+
 ## [1.0.0](https://github.com/elastic/ecs/compare/v1.0.0-beta2...v1.0.0)
 
 ### Breaking changes
@@ -114,6 +139,7 @@ All notable changes to this project will be documented in this file based on the
 * Clarify that source/destination should be filled, even if client/server is
   being used. #265
 
+
 ## [1.0.0-beta1](https://github.com/elastic/ecs/compare/v0.1.0...v1.0.0-beta1)
 
 ### Breaking changes
@@ -166,6 +192,7 @@ All notable changes to this project will be documented in this file based on the
 * Remove duplicate definitions of the reuseable `os` field set from `host.os` and
   `user_agent.os`.  #168
 
+
 ## 0.1.0
 
 Initial draft release
diff --git a/CHANGELOG.next.md b/CHANGELOG.next.md
index 1bd2283d1d..edc5cf66f4 100644
--- a/CHANGELOG.next.md
+++ b/CHANGELOG.next.md
@@ -1,3 +1,8 @@
+<!-- When adding an entry to the Changelog:
+- Please follow the Keep a Changelog: http://keepachangelog.com/ guidelines.
+- Please insert your changelog line ordered by PR ID.
+Thanks, you're awesome :-) -->
+
 ## Unreleased
 
 ### Breaking changes
@@ -6,23 +11,8 @@
 
 ### Added
 
-* Added `dns.*` field set, to describe DNS traffic. #438
-* Added `process.uptime` and `host.uptime` fields. #475
-* Added field formats to all `.bytes` fields and `event.duration`. #385, #425
-* Added `hash.*` field set. #426
-* Added `event.code`, `event.sequence` and `event.provider`. #439
-* Added `file.name` and `file.directory`. #441
-* Added `file.created`, and `file.accessed`. #445
-* Added `domain` field to user. #486
-* Added `.nat.ip` and `.nat.port` to `source`, `destination`, `client` and `server`. #491
-* Added `as` fields for Autonomous System information (i.e. ASN). #341
-* Added `process.thread.name` field. #517
-* Added `log.logger` field. #521
-
 ### Improvements
 
-* Added examples and improved definitions of many `file` fields. #441
-
 ### Deprecated