Merge branch 'master' into devel · cloudfoundry-attic/vcap-services@6e778aa · GitHub

This repository has been archived by the owner on Jan 26, 2022. It is now read-only.

Commit

Merge branch 'master' into devel

Browse files

Conflicts:
	rabbit/lib/rabbit_service/rabbit_node.rb
	rabbit/spec/node_spec.rb
	redis/spec/node_spec.rb

Change-Id: Ic48a69313614d79a7e7bba7dec7f555a74b699fd

Loading branch information

rtang committed Jul 29, 2011

2 parents 97b5490 + 1eea878 commit 6e778aa