Permalink
Browse files

Merge branch 'master' into services-r7

Conflicts:
	atmos/Gemfile
	atmos/Gemfile.lock
	base/Gemfile
	base/Gemfile.lock
	filesystem/vendor/cache/daemons-1.1.2.gem
	filesystem/vendor/cache/json_pure-1.5.1.gem
	filesystem/vendor/cache/little-plugger-1.1.2.gem
	filesystem/vendor/cache/logging-1.5.0.gem
	filesystem/vendor/cache/nats-0.4.10.gem
	filesystem/vendor/cache/rack-1.2.2.gem
	filesystem/vendor/cache/yajl-ruby-0.8.2.gem
	mongodb/Gemfile
	mongodb/Gemfile.lock
	mysql/Gemfile.lock
	neo4j/Gemfile
	neo4j/Gemfile.lock
	postgresql/Gemfile.lock
	rabbit/Gemfile.lock
	redis/Gemfile.lock
	serialization_data_server/vendor/cache/nats-0.4.10.gem
	service_broker/Gemfile.lock
	tools/backup/manager/Gemfile.lock

Change-Id: I576b9c15b65f0a44a2f6003e0d7aa5c3a7470826
  • Loading branch information...
2 parents d059fd1 + c2b945c commit fec3a15097d10d7996c1604990cf9447201ad164 felixhoo committed Jan 5, 2012
Showing with 18 additions and 17 deletions.
  1. +14 −13 Gemfile.lock
  2. +1 −1 lib/base/version.rb
  3. +3 −3 vcap_services_base.gemspec
View
@@ -1,21 +1,21 @@
PATH
remote: .
specs:
- vcap_services_base (0.1.1)
+ vcap_services_base (0.1.4)
curb (~> 0.7.16)
datamapper (~> 1.1.0)
do_sqlite3 (~> 0.10.3)
em-http-request (~> 0.3.0)
eventmachine (~> 0.12.11.cloudfoundry.3)
eventmachine_httpserver (~> 0.2.1)
json (~> 1.4.6)
- nats (~> 0.4.10)
+ nats (~> 0.4.22.beta.4)
resque-status (~> 0.2.4)
ruby-hmac (~> 0.4.0)
sinatra (~> 1.2.3)
- thin (~> 1.2.11)
+ thin (~> 1.3.1)
uuidtools (~> 2.1.2)
- vcap_common (~> 1.0.2)
+ vcap_common (>= 1.0.4)
vcap_logging (>= 0.1.3)
GEM
@@ -77,19 +77,20 @@ GEM
eventmachine_httpserver (0.2.1)
fastercsv (1.5.4)
json (1.4.6)
- json_pure (1.6.3)
+ json_pure (1.6.4)
little-plugger (1.1.3)
logging (1.6.1)
little-plugger (>= 1.1.2)
macaddr (1.5.0)
systemu (>= 2.4.0)
multi_json (1.0.4)
- nats (0.4.10)
- daemons (>= 1.1.0)
+ nats (0.4.22.beta.4)
+ daemons (>= 1.1.4)
eventmachine (>= 0.12.10)
- json_pure (>= 1.5.1)
+ json_pure (>= 1.6.1)
+ thin (>= 1.3.1)
posix-spawn (0.3.6)
- rack (1.2.2)
+ rack (1.4.0)
rake (0.8.7)
rcov (0.9.9)
redis (2.2.2)
@@ -121,20 +122,20 @@ GEM
tilt (>= 1.2.2, < 2.0)
stringex (1.2.2)
systemu (2.4.2)
- thin (1.2.11)
+ thin (1.3.1)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
tilt (1.2.2)
uuid (2.3.4)
macaddr (~> 1.0)
uuidtools (2.1.2)
- vcap_common (1.0.2)
+ vcap_common (1.0.4)
eventmachine (~> 0.12.11.cloudfoundry.3)
logging (>= 1.5.0)
- nats (~> 0.4.10)
+ nats (~> 0.4.22.beta.4)
posix-spawn (~> 0.3.6)
- thin (~> 1.2.11)
+ thin (~> 1.3.1)
yajl-ruby (~> 0.8.3)
vcap_logging (0.1.3)
vegas (0.1.8)
View
@@ -1,7 +1,7 @@
module VCAP
module Services
module Base
- VERSION = "0.1.3"
+ VERSION = "0.1.4"
end
end
end
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
s.author = "CloudFoundry Services Team"
s.email = "cf-services-eng-cn@vmware.com"
- s.add_dependency "nats", "~> 0.4.10"
+ s.add_dependency "nats", "~> 0.4.22.beta.4"
s.add_dependency "datamapper", "~> 1.1.0"
s.add_dependency "do_sqlite3", "~> 0.10.3"
s.add_dependency "eventmachine", "~> 0.12.11.cloudfoundry.3"
@@ -22,8 +22,8 @@ Gem::Specification.new do |s|
s.add_dependency "ruby-hmac", "~> 0.4.0"
s.add_dependency "em-http-request", "~> 0.3.0"
s.add_dependency "sinatra", "~> 1.2.3"
- s.add_dependency "thin", "~> 1.2.11"
- s.add_dependency "vcap_common", "~> 1.0.2"
+ s.add_dependency "thin", "~> 1.3.1"
+ s.add_dependency "vcap_common", ">= 1.0.4"
s.add_dependency "vcap_logging", ">=0.1.3"
s.add_dependency "resque-status", "~> 0.2.4"
s.add_dependency "curb", "~> 0.7.16"

0 comments on commit fec3a15

Please sign in to comment.