Skip to content

Fix an issue where a bare metal server order crashes trying to retrie… #109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 19, 2016
Merged

Fix an issue where a bare metal server order crashes trying to retrie… #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f9d0355
Fix an issue where a bare metal server order crashes trying to retrie…
Jan 19, 2016
1fd2b40
Updated travis CI testing
Jan 19, 2016
319f9dd
Handled merge conflicts from the missing 3.1 merge
Jan 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: ruby
rvm:
- "2.2.1"
- "2.1.3"
- "2.1.1"
- "2.3.0"
- "2.2.4"
- "2.1.8"
- "2.0.0"
- jruby-19mode
3 changes: 3 additions & 0 deletions CHANGELOG.textile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
*3.2.1*
Fix a crashing issue where a Bare Metal server order tried to retrieve the hardware ordered before it has been provisioned.

*3.2*
* Add password-based authentication with `SoftLayer::Client.with_password(username: '...', password: '...', ...)`.

Expand Down
2 changes: 1 addition & 1 deletion lib/softlayer/BareMetalServerOrder.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ def place_order!()
order_template = yield order_template if block_given?

server_hash = @softlayer_client[:Hardware].createObject(order_template)
SoftLayer::BareMetalServer.server_with_id(server_hash['id'], :client => @softlayer_client) if server_hash
return server_hash
end

protected
Expand Down
2 changes: 1 addition & 1 deletion lib/softlayer/base.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
module SoftLayer
# The version number (including major, minor, and bugfix numbers)
# This should change in accordance with the concept of Semantic Versioning
VERSION = "3.2.0" # version history in the CHANGELOG.textile file at the root of the source
VERSION = "3.2.1" # version history in the CHANGELOG.textile file at the root of the source

# The base URL of the SoftLayer API available to the public internet.
API_PUBLIC_ENDPOINT = 'https://api.softlayer.com/xmlrpc/v3/'
Expand Down