Merge pull request #1999 from sbergmann/master

Fix #server so that it returns the right server instead of all servers

lib/fog/aws/models/compute/volume.rb

@@ -71,7 +71,7 @@ module Fog
 
         def server
           requires :server_id
-          service.servers('instance-id' => server_id)
+          service.servers.get(server_id)
         end
 
         def server=(new_server)

tests/aws/models/compute/volume_tests.rb

@@ -14,7 +14,7 @@ Shindo.tests("Fog::Compute[:aws] | volume", ['aws']) do
     @instance.wait_for { state == 'in-use' }
 
     tests('#server').succeeds do
-      @instance.server
+      @instance.server.id == @server.id
     end
 
     tests('#server = nil').succeeds do