Skip to content

Commit 0adc0e4

Browse files
committed
Merge pull request #109 from SLsthompson/master
Fix an issue where a bare metal server order crashes trying to retrie…
2 parents 47755f0 + 319f9dd commit 0adc0e4

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: ruby
22
rvm:
3-
- "2.2.1"
4-
- "2.1.3"
5-
- "2.1.1"
3+
- "2.3.0"
4+
- "2.2.4"
5+
- "2.1.8"
66
- "2.0.0"
77
- jruby-19mode

CHANGELOG.textile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
*3.2.1*
2+
Fix a crashing issue where a Bare Metal server order tried to retrieve the hardware ordered before it has been provisioned.
3+
14
*3.2*
25
* Add password-based authentication with `SoftLayer::Client.with_password(username: '...', password: '...', ...)`.
36

lib/softlayer/BareMetalServerOrder.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ def place_order!()
133133
order_template = yield order_template if block_given?
134134

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

139139
protected

lib/softlayer/base.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
module SoftLayer
1313
# The version number (including major, minor, and bugfix numbers)
1414
# This should change in accordance with the concept of Semantic Versioning
15-
VERSION = "3.2.0" # version history in the CHANGELOG.textile file at the root of the source
15+
VERSION = "3.2.1" # version history in the CHANGELOG.textile file at the root of the source
1616

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

0 commit comments

Comments
 (0)