Merge pull request #2564 from jekyll/release-2-1-1

History.markdown

@@ -4,15 +4,20 @@
 
 ### Minor Enhancements
 
-  * Patch read vulnerabilities for data & confirm none for layouts (#2563)
+### Bug Fixes
-  * Update Maruku dependency to allow use of the latest version (#2576)
+
+### Development Fixes
+
+### Site Enhancements
+
+## 2.1.1 / 2014-07-01
 
 ### Bug Fixes
 
+  * Patch read vulnerabilities for data & confirm none for layouts (#2563)
+  * Update Maruku dependency to allow use of the latest version (#2576)
   * Remove conditional assignment from document URL to prevent stale urls (#2575)
 
-### Development Fixes
-
 ### Site Enhancements
 
   * Add vertical margin to `highlight` to separate code blocks (#2558)

lib/jekyll/version.rb

@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = '2.1.0'
+  VERSION = '2.1.1'
 end

site/_posts/2014-07-01-jekyll-2-1-1-released.markdown

@@ -0,0 +1,30 @@
+---
+layout: news_item
+title: 'Jekyll 2.1.1 Released'
+date: 2014-07-01 20:16:43 -0400
+author: parkr
+version: 2.1.1
+categories: [release]
+---
+
+This is a minor release for Jekyll 2.1.0. It fixes a couple bugs and
+introduces fixes for a couple security-related issues.
+
+It covers two security vulnerabilities:
+
+1. One in the reading of data
+2. One in the `layouts` setting
+
+They were identified in Jekyll 1.5.1 and has been confirmed as patched
+in this version and the version used by GitHub Pages. If you are in the
+business of building Jekyll sites, please ensure you upgrade to 2.1.1 as
+soon as possible.
+
+For more, check out [`jekyll/jekyll#2563`](https://github.com/jekyll/jekyll/pull/2563).
+
+Additionally, the dependency on Maruku has been loosened and a bug was
+fixed with document URLs.
+
+As always, check out the [full changelog](/docs/history/) for more info!
+
+Happy Jekylling!