diff options
| author | Luca Guidi <guidi.luca@gmail.com> | 2008-11-03 10:07:05 +0100 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2008-11-06 19:59:02 +0000 |
| commit | 4ccbc5dffb980edf35be899889f9e227dbd426c7 (patch) | |
| tree | 28aacc749f7a7a6c17820a58cc1d09e0f4843877 /activesupport/lib | |
| parent | 099f10679ec6d9ead9606cac2f843e854787db0c (diff) | |
| download | rails-4ccbc5dffb980edf35be899889f9e227dbd426c7.tar.gz rails-4ccbc5dffb980edf35be899889f9e227dbd426c7.tar.bz2 rails-4ccbc5dffb980edf35be899889f9e227dbd426c7.zip | |
Increment the version of our modified memcache_client code to prevent users with the gem installed not seeing our changes.
The changes will be submitted upstream.
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#1239 state:committed]
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/vendor.rb | 4 | ||||
| -rw-r--r-- | activesupport/lib/active_support/vendor/memcache-client-1.5.1/memcache.rb (renamed from activesupport/lib/active_support/vendor/memcache-client-1.5.0/memcache.rb) | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/activesupport/lib/active_support/vendor.rb b/activesupport/lib/active_support/vendor.rb index 633eb2ef08..dc98936525 100644 --- a/activesupport/lib/active_support/vendor.rb +++ b/activesupport/lib/active_support/vendor.rb @@ -14,9 +14,9 @@ rescue Gem::LoadError end begin - gem 'memcache-client', '~> 1.5.0' + gem 'memcache-client', '~> 1.5.1' rescue Gem::LoadError - $:.unshift "#{File.dirname(__FILE__)}/vendor/memcache-client-1.5.0" + $:.unshift "#{File.dirname(__FILE__)}/vendor/memcache-client-1.5.1" end begin diff --git a/activesupport/lib/active_support/vendor/memcache-client-1.5.0/memcache.rb b/activesupport/lib/active_support/vendor/memcache-client-1.5.1/memcache.rb index 30113201a6..99c9af0398 100644 --- a/activesupport/lib/active_support/vendor/memcache-client-1.5.0/memcache.rb +++ b/activesupport/lib/active_support/vendor/memcache-client-1.5.1/memcache.rb @@ -1,10 +1,10 @@ # All original code copyright 2005, 2006, 2007 Bob Cottrell, Eric Hodel, # The Robot Co-op. All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: -# +# # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright @@ -13,7 +13,7 @@ # 3. Neither the names of the authors nor the names of their contributors # may be used to endorse or promote products derived from this software # without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS # OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |