merge changelog from 1.2.x back into master

Closes #301

Author: rolweber

CHANGELOG.md

@@ -20,6 +20,12 @@
 * Fix security requirements in the swagger spec
 * Fix configured headers for OPTIONS requests
 
+## 1.2.2 (2017-05-30)
+
+* Inherit the server `PATH` when launching a new kernel via POST request
+  with custom environment variables
+* Fix kernel cleanup upon SIGTERM
+
 ## 1.2.1 (2017-04-01)
 
 * Add support for auth token as a query parameter

docs/source/summary-changes.md

@@ -26,6 +26,12 @@ See `git log` for a more detailed summary of changes.
 
 ## 1.2
 
+### 1.2.2 (2017-05-30)
+
+* Inherit the server `PATH` when launching a new kernel via POST request
+  with custom environment variables
+* Fix kernel cleanup upon SIGTERM
+
 ### 1.2.1 (2017-04-01)
 
 * Add support for auth token as a query parameter