Brian Hartsock 49300e6260 Merge remote-tracking branch 'scotje/master' ... Conflicts: lib/fog/rackspace/models/compute_v2/server.rb		2012-11-09 20:37:22 -05:00
..
models	Merge remote-tracking branch 'scotje/master'	2012-11-09 20:37:22 -05:00
requests	Merge remote-tracking branch 'scotje/master'	2012-11-09 20:37:22 -05:00
block_storage.rb	[rackspace|blockstorage] Add snapshots to block storage.	2012-09-13 10:27:01 -04:00
cdn.rb	Remove absolute path when requiring	2012-05-26 11:27:28 -04:00
compute.rb	[rackspace|compute] fixes for mock images	2012-06-23 17:03:00 -05:00
compute_v2.rb	[rackspace|compute] Add attachments model and collection.	2012-09-13 10:37:37 -04:00
databases.rb	[rackspace|databases] Finish request tests.	2012-06-28 23:10:49 -04:00
dns.rb	Remove absolute path when requiring	2012-05-26 11:27:28 -04:00
identity.rb	[rackspace|identity] Add user model and collection with tests.	2012-06-23 16:40:40 -04:00
load_balancers.rb	[rackspace|lb] ssl termination fixes	2012-06-26 00:35:07 -04:00
storage.rb	Merge pull request #1000 from yob/rackspace_temp_urls	2012-08-07 16:10:24 -07:00