proper user creation in OS create_server mock
Adding support for AWS CloudFormation list_stacks and list_stack_resources API calls
Using AWS::Compute::Error for CloudFormation errors produces erroneous error messages
[rackspace|storage] add large object container and prefix options

Allows the container and name prefix used to store large object segments
to be specified when creating the manifest object.
Merge pull request #1800 from burns/large_objects

[rackspace|storage] add large object container and prefix options
Add :id attribute to libvirt nic model

My cutting edge version of libvirt (1.0.4 Archlinux) seems to reply with  :id for NICs, causing the nic model to break.
Revert "Updated gem spec to require json rather than multi_json"

This reverts commits: 66638b25d76a5eb737c9a41ed9b4847841549d50,
3f0314dbd1972051e0f705e8f83813e7e2305e46, and
18ce4b7eca41ea75d45564466e4d44076128981e.

Since google-api-client was added as a dependency in afa9b025e9a1c47488,
multi_json is a de facto dependency of fog, so this is a needless layer.
If #1034 is still an issue, I'd be happy to ship a version of multi_json
that requires rubygems >= 1.3.5.
Merge pull request #1803 from GregSutcliffe/patch-1

Add :id attribute to libvirt nic model
Merge pull request #1801 from sferik/multi_json

Revert "Updated gem spec to require json rather than multi_json"
Merge pull request #1798 from CloudHealth/master

AWS Cloudformation list_stacks and list_stack_resources API support
Fixes #39 joyent server resize command requires expected response code
fail when cloudstack default view empty
Support pagination on Zerigo DNS zones

For Zerigo accounts with more than 100 domains, the previous zones.all
method was unable to get to records beyond 100. This adds pagination per
the Zerigo API doc with :per_page and :page parameters. You can then use
count_zones to get the total zone count, divide by your :per_page, and
iterate over all pages to fetch all your zones.

https://www.zerigo.com/docs/apis/dns/1.1/zones/index
Fix "cache_controle" typo in docs
[Zerigo|DNS] Remove default 3600 TTL

Zerigo records and zones were setting a TTL of 3600 on the model if no
TTL was set in the response. On first glance this seems like A Good
Thing - yes we want a default TTL! However, it masks the fact that a
record might have no TTL set on it and is using the default TTL from the
zone. If you're trying to use the model to determine if the TTL is set
to some value (say 3600), but the value defaults to 3600 if it isn't
set, then you have no way of knowing if it's right or not.

This change forces you to set a TTL if you're performing an operation
that requires one (#save).
Don't parse non-JSON response
Support both RSpec 1.x and 2.x
Merge pull request #1813 from strzibny/master

Support RSpec 2.x
Merge pull request #1810 from mark-rushakoff/typo-fix

Fix "cache_controle" typo in docs
Merge pull request #1373 from kuinak/master

proper user creation in OS create_server mock