From 45ea1641aa51d652d630e752be8909f0ad2b9a66 Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas@kluyver.me.uk>
Date: Sat, 16 Dec 2017 21:14:52 +0000
Subject: [PATCH] Add PRs #310 and #311 to changelog

---
 docs/changelog.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index acf5de399..c721fc4d6 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -32,6 +32,11 @@ Changes in Jupyter Client
 - If a kernel dies soon after starting, reassign random ports before restarting
   it, in case one of the previously chosen ports has been bound by another
   process (:ghpull:`279`).
+- Avoid unnecessary filesystem operations when finding a kernelspec with
+  :meth:`.KernelSpecManager.get_kernel_spec` (:ghpull:`311`).
+- :meth:`.KernelSpecManager.get_all_specs` will no longer raise an exception on
+  encountering an invalid ``kernel.json`` file. It will raise a warning and
+  continue (:ghpull:`310`).
 - Check for non-contiguous buffers before trying to send them through ZMQ
   (:ghpull:`258`).
 - Compatibility with upcoming Tornado version 5.0 (:ghpull:`304`).