Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into fog_2_development
* master: (105 commits) Adds `ovirt_filtered_api` to list of recognized options for Ovirt service Fine-tune affinity group mockups Implement affinity group mockups Remove dangeling references to pry debugger Implement affinity groups Add alias attribute to ovirt/compute/volume.rb Extract local storage provider Release 1.28.0 Pass options when get resources from a stack Add missing braces Use fog-core 1.27.4 and above Use correct variable in code example Remove duplicate lines from code example Adding multiple server support for Docker Fix method names errors in exception remove redundant requires [joyent|compute] support for gracefully handling 400 error responses from api Fixes #3434 Add floating disks manipulation in rbovirt provider Added extra parameters for domain suffixes and gateway, added comments Port Rackspace Orchestration implementation to OpenStack ... Conflicts: .travis.yml fog.gemspec
- Loading branch information
Showing
1,575 changed files
with
6,359 additions
and
74,061 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.