From 470e4f9e910837c5fc99b038b7ffcf653cffa061 Mon Sep 17 00:00:00 2001
From: Buck Golemon <buck@yelp.com>
Date: Thu, 8 Oct 2015 10:51:22 -0700
Subject: [PATCH] changelog entry

---
 CHANGELOG | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index e20532a9b..530ecf0ea 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,9 @@
 
 * New `pytest.mark.skip` mark, which unconditional skips marked tests.
   Thanks Michael Aquilina for the complete PR.
+* fix issue #680: the -s and -c options should now work under xdist;
+  `Config.fromdictargs` now represents its input much more faithfully.
+  Thanks to Buck Evan for the complete PR.
 
 2.8.2.dev
 ---------