From dd4bea9603ae38a508fea3250fb7de28068f9fdf Mon Sep 17 00:00:00 2001
From: Ilya Maykov <ilyam@ooyala.com>
Date: Tue, 16 Aug 2011 11:34:11 -0700
Subject: [PATCH] Bumped thrift_client gem dependency to 0.7.0, bumped
 cassandra gem version to 0.12.0.

---
 CHANGELOG         |  2 ++
 Gemfile           |  0
 Gemfile.lock      |  8 ++++----
 Rakefile          |  2 +-
 cassandra.gemspec | 10 +++++-----
 lib/cassandra.rb  |  2 +-
 6 files changed, 13 insertions(+), 11 deletions(-)
 mode change 100644 => 100755 Gemfile
 mode change 100644 => 100755 Gemfile.lock

diff --git a/CHANGELOG b/CHANGELOG
index f79f2be..44ac4d9 100755
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,5 @@
+v0.12.0 Changed thrift_client dependency to 0.7.0
+
 v0.11.4
 - Fix get_range to invoke blocks
 - Fix current distribution urls in Rakfile. Resolves Issue# 97.
diff --git a/Gemfile b/Gemfile
old mode 100644
new mode 100755
diff --git a/Gemfile.lock b/Gemfile.lock
old mode 100644
new mode 100755
index bae6aa4..e0b1d86
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -5,7 +5,7 @@ PATH
       json
       rake
       simple_uuid (>= 0.1.0)
-      thrift_client (>= 0.6.3)
+      thrift_client (>= 0.7.0)
 
 GEM
   remote: http://rubygems.org/
@@ -26,9 +26,9 @@ GEM
     rubyforge (2.0.4)
       json_pure (>= 1.1.7)
     simple_uuid (0.1.2)
-    thrift (0.6.0)
-    thrift_client (0.6.3)
-      thrift (~> 0.6.0)
+    thrift (0.7.0)
+    thrift_client (0.7.0)
+      thrift (~> 0.7.0)
 
 PLATFORMS
   ruby
diff --git a/Rakefile b/Rakefile
index b27c8f5..1133389 100755
--- a/Rakefile
+++ b/Rakefile
@@ -9,7 +9,7 @@ unless ENV['FROM_BIN_CASSANDRA_HELPER']
     p.project = "fauna"
     p.summary = "A Ruby client for the Cassandra distributed database."
     p.rubygems_version = ">= 0.8"
-    p.dependencies = ['thrift_client >=0.6.3', 'json', 'rake', 'simple_uuid >=0.1.0']
+    p.dependencies = ['thrift_client >=0.7.0', 'json', 'rake', 'simple_uuid >=0.1.0']
     p.ignore_pattern = /^(data|vendor\/cassandra|cassandra|vendor\/thrift|.*\.rbc)/
     p.rdoc_pattern = /^(lib|bin|tasks|ext)|^README|^CHANGELOG|^TODO|^LICENSE|^COPYING$/
     p.retain_gemspec = true
diff --git a/cassandra.gemspec b/cassandra.gemspec
index 1204ebe..9fff01f 100755
--- a/cassandra.gemspec
+++ b/cassandra.gemspec
@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cassandra}
-  s.version = "0.11.4"
+  s.version = "0.12.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0.8") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Evan Weaver, Ryan King}]
-  s.date = %q{2011-07-22}
+  s.date = %q{2011-08-16}
   s.description = %q{A Ruby client for the Cassandra distributed database.}
   s.email = %q{}
   s.executables = [%q{cassandra_helper}]
@@ -24,18 +24,18 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<thrift_client>, [">= 0.6.3"])
+      s.add_runtime_dependency(%q<thrift_client>, [">= 0.7.0"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<rake>, [">= 0"])
       s.add_runtime_dependency(%q<simple_uuid>, [">= 0.1.0"])
     else
-      s.add_dependency(%q<thrift_client>, [">= 0.6.3"])
+      s.add_dependency(%q<thrift_client>, [">= 0.7.0"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<simple_uuid>, [">= 0.1.0"])
     end
   else
-    s.add_dependency(%q<thrift_client>, [">= 0.6.3"])
+    s.add_dependency(%q<thrift_client>, [">= 0.7.0"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<simple_uuid>, [">= 0.1.0"])
diff --git a/lib/cassandra.rb b/lib/cassandra.rb
index d3379e8..7b9b09d 100755
--- a/lib/cassandra.rb
+++ b/lib/cassandra.rb
@@ -1,5 +1,5 @@
 require 'rubygems'
-gem 'thrift_client', '~> 0.6.3'
+gem 'thrift_client', '~> 0.7.0'
 require 'thrift_client'
 gem 'simple_uuid' , '~> 0.1.0'
 require 'simple_uuid'