From 5e6607680d5c834cf8b2fc577d7c84dae37ea9ea Mon Sep 17 00:00:00 2001
From: slyphon <slyphon@gmail.com>
Date: Fri, 11 May 2012 15:53:48 +0000
Subject: [PATCH] only require backports for 1.8.7, bump version to 1.0.6

---
 CHANGELOG                | 4 ++++
 lib/zookeeper.rb         | 4 +---
 lib/zookeeper/version.rb | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 75a3b3f..1152b3b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+v1.0.6 Only include backports if RUBY_VERSION is 1.8.x
+
+  * 'backports' pollutes too much, use sparingly
+
 v1.0.5 Minor cleanup
 
   * Fix the InheritedConnectionError message
diff --git a/lib/zookeeper.rb b/lib/zookeeper.rb
index 3fd5615..6bebbcc 100644
--- a/lib/zookeeper.rb
+++ b/lib/zookeeper.rb
@@ -11,9 +11,7 @@ module Zookeeper
 
 require File.expand_path('../zookeeper/core_ext', __FILE__)
 
-silence_warnings do
-  require 'backports'
-end
+require 'backports' if RUBY_VERSION =~ /\A1\.8\./
 
 require_relative 'zookeeper/logger'
 require_relative 'zookeeper/forked'
diff --git a/lib/zookeeper/version.rb b/lib/zookeeper/version.rb
index c132f0e..e661373 100644
--- a/lib/zookeeper/version.rb
+++ b/lib/zookeeper/version.rb
@@ -1,4 +1,4 @@
 module Zookeeper
-  VERSION = '1.0.5'
+  VERSION = '1.0.6'
   DRIVER_VERSION = '3.3.5'
 end