Merge remote-tracking branch 'original/Version_2.2.0'

Conflicts:
	lib/softlayer/VirtualServer.rb

Author: SLsthompson

CHANGELOG.textile

@@ -7,7 +7,8 @@
 * The routine to retreive the open tickets on an account has been moved from the Ticket class. The set of open tickets is now a dynamic property of an account object.
 
 *2.2*
-* Added the ability to set a timout for network requests.  The timeout is given when a client is created by passing the :timeout hash parameter when creating a client. The value of the parameter is an integer number of seconds.
+* Added the ability to set a timout for network requests. The timeout is given when a client is created by passing the :timeout hash parameter when creating a client. The value of the parameter is an integer number of seconds.
+* Fixed a bug in VirtualServer#capture_image
 
 *2.1.1*
 * Virtual server upgrades no longer raise exceptions

lib/softlayer/VirtualServer.rb

@@ -87,13 +87,16 @@ def cancel!
     # You may use the wait_until_ready routine of SoftLayer::ImageTemplate to
     # wait on it.
     #
-    def capture_image(image_name, include_attached_storage = false, image_notes = nil)
+    def capture_image(image_name, include_attached_storage = false, image_notes = '')
+      image_notes = '' if !image_notes
+      image_name = 'Captured Image' if !image_name
+
       disk_filter = lambda { |disk| disk['device'] == '0' }
       disk_filter = lambda { |disk| disk['device'] != '1' } if include_attached_storage
 
       disks = self.blockDevices.select(&disk_filter)
 
-      self.service.createArchiveTransaction(image_name, disks, notes ? notes : "") if disks && !disks.empty?
+      self.service.createArchiveTransaction(image_name, disks, image_notes) if disks && !disks.empty?
 
       image_templates = SoftLayer::ImageTemplate.find_private_templates(:name => image_name)
       image_templates[0] if !image_templates.empty?