From f3d1d7ab6fd7121edb2272d4ea942abdbcc77ff6 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Wed, 12 Jul 2017 15:24:15 -0700
Subject: [PATCH] WIP: ChangeLog: Document changes since v1.0.0-rc6

Through FIXME (whatever commit merges both #895 and #896).

Signed-off-by: W. Trevor King <wking@tremily.us>
---
 ChangeLog | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 5536bcd56..ba836a08b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,24 @@
 OpenContainers Specifications
 
+Changes with v1.0.0-rc6:
+
+	Breaking changes:
+
+	* config: Shift disableOOMKiller from linux.resources to
+	  linux.resources.memory (#896)
+
+	Decreased restrictions:
+
+	* runtime: Make the state JSON's pid optional on non-Linux platforms
+	  (#895)
+
+	Minor fixes and documentation:
+
+	* schema/defs-linux: Require Syscall.action (#885)
+	* specs-go/config: Fix 'omiempty' -> 'omitempty' typo for
+	  LinuxSeccompArg.ValueTwo (#884)
+	* ROAMAP: remove the pre-v1.0.0 roadmap (#890)
+
 Changes with v1.0.0-rc6:
 
 	Breaking changes: