Patrick Bozeman 54f40e2c51 manually squashed merge of release_64_fixes branch (w/conflicts) ... This also contains a race condition fix for the stager unit test. Change-Id: Id698909dfb0c26c5fde7d5cef52cce63230f7ad8		2012-04-03 11:43:57 -07:00
..
config	-split up client and server into seperate branches.	2012-01-24 20:02:53 -08:00
lib/vcap/package_cache_client	-removed exclusion from unit test.	2012-01-24 21:09:39 -08:00
spec	-removed exclusion from unit test.	2012-01-24 21:09:39 -08:00
vendor/cache	manually squashed merge of release_64_fixes branch (w/conflicts)	2012-04-03 11:43:57 -07:00
Gemfile	-split up client and server into seperate branches.	2012-01-24 20:02:53 -08:00
Gemfile.lock	manually squashed merge of release_64_fixes branch (w/conflicts)	2012-04-03 11:43:57 -07:00
Rakefile	-split up client and server into seperate branches.	2012-01-24 20:02:53 -08:00
package_cache_client.gemspec	Merge branch 'services-r7'	2012-02-01 09:47:21 -08:00