From a61c639305a5d78d21e30c61cc72edfafdbbd59f Mon Sep 17 00:00:00 2001
From: TAGOMORI Satoshi <tagomoris@gmail.com>
Date: Mon, 26 Dec 2016 13:32:59 +0900
Subject: [PATCH 1/2] add Ruby 2.4 as supported version

---
 .travis.yml  | 16 +++++++++++-----
 appveyor.yml |  1 +
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3ecb6b51a5..6f628ff8a4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,19 +13,25 @@ matrix:
       os: linux
     - rvm: 2.3.3
       os: linux
-    - rvm: 2.4.0-rc1
+    - rvm: 2.4.0
       os: linux
     - rvm: ruby-head
       os: linux
     - rvm: 2.1.10
       os: osx
-      osx_image: xcode7.3 # OSX 10.11
-    - rvm: 2.2.5
+      osx_image: xcode8.2 # OSX 10.12
+    # - rvm: 2.2.6
+    #   os: osx
+    #   osx_image: xcode8.2 # OSX 10.12
+    # - rvm: 2.3.3
+    #   os: osx
+    #   osx_image: xcode8.2 # OSX 10.12
+    - rvm: 2.4.0
       os: osx
-      osx_image: xcode7.3 # OSX 10.11
+      osx_image: xcode8.2 # OSX 10.12
     - rvm: ruby-head
       os: osx
-      osx_image: xcode 7.3 # OSX 10.11
+      osx_image: xcode 8.2 # OSX 10.12
   allow_failures:
     - rvm: ruby-head
 
diff --git a/appveyor.yml b/appveyor.yml
index 4f72f5f148..fc2a2a1c70 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -21,6 +21,7 @@ branches:
     - v0.12
     - v0.14
 
+# https://www.appveyor.com/docs/installed-software/#ruby
 environment:
   matrix:
     - ruby_version: "23-x64"

From 0d6a3276b790951dedcfcacf870422a08b27adfe Mon Sep 17 00:00:00 2001
From: TAGOMORI Satoshi <tagomoris@gmail.com>
Date: Mon, 26 Dec 2016 13:33:16 +0900
Subject: [PATCH 2/2] v0.14.11

---
 ChangeLog             | 26 ++++++++++++++++++++++++++
 lib/fluent/version.rb |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 14caa27cf3..3b142c2552 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,31 @@
 # v0.14
 
+## Release v0.14.11 - 2016/12/26
+
+### New features / Enhancements
+* Add "root_dir" parameter in <system> directive to configure server root directory, used for buffer/storage paths
+  https://github.com/fluent/fluentd/pull/1374
+* Fix not to restart Fluentd processes when unrecoverable errors occur
+  https://github.com/fluent/fluentd/pull/1359
+* Show warnings in log when output flush operation takes longer time than threshold
+  https://github.com/fluent/fluentd/pull/1370
+* formatter_csv: Raise configuration error when no field names are specified
+  https://github.com/fluent/fluentd/pull/1369
+* in_syslog: Update implementation to use plugin helpers
+  https://github.com/fluent/fluentd/pull/1382
+* in_forward: Add a configuration parameter "source_address_key"
+  https://github.com/fluent/fluentd/pull/1382
+* in_monitor_agent: Add a parameter "include_retry" to get detail retry status
+  https://github.com/fluent/fluentd/pull/1387
+* Add Ruby 2.4 into supported ruby versions
+
+### Bug fixes
+* Fix to set process name of supervisor process
+https://github.com/fluent/fluentd/pull/1380
+* in_forward: Fix a bug not to handle "require_ack_response" correctly
+https://github.com/fluent/fluentd/pull/1389
+
+
 ## Release v0.14.10 - 2016/12/14
 
 ### New features / Enhancement
diff --git a/lib/fluent/version.rb b/lib/fluent/version.rb
index 5d419c9fcc..49fc701016 100644
--- a/lib/fluent/version.rb
+++ b/lib/fluent/version.rb
@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '0.14.10'
+  VERSION = '0.14.11'
 
 end