Merge pull request #12 from ThomasRasmussen/master

A couple of fixes to support zenoss 4.2.5

Author: bjmllr

VERSION

@@ -1 +1 @@
-0.5.3
+0.5.5

lib/zenoss/connection.rb

@@ -54,6 +54,7 @@ def sign_in(user,pass)
       resp = @httpcli.post login_path, login_parms
       if(resp.status == 302)
         login_path = resp.header['Location'].first
+        login_path = "#{@zenoss_uri}/#{login_path}"
         resp = @httpcli.post login_path, login_parms 
         raise ZenossError, "(HTTP Response #{resp.status}) Could not authenticate to #{@zenoss_uri}" unless resp.status == 200
       end

lib/zenoss/jsonapi/events_router.rb

@@ -68,7 +68,6 @@ def ev_query(uid, opts)
           :start    => opts[:start],
           :sort     => opts[:sort],
           :dir      => opts[:dir],
-          :history  => opts[:history],
         }
         data[:uid] = uid unless uid.nil?
         data[:params] = opts[:params] if opts.has_key?(:params)