Fix merge error
Project: http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/commit/8812bfbf Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/tree/8812bfbf Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/diff/8812bfbf Branch: refs/heads/master Commit: 8812bfbf505bffe015b522dec1f0eb65d8bb6298 Parents: 6b1f94b Author: Chiradeep Vittal <[email protected]> Authored: Wed Apr 23 15:39:29 2014 -0700 Committer: Chiradeep Vittal <[email protected]> Committed: Wed Apr 23 15:42:00 2014 -0700 ---------------------------------------------------------------------- cloudmonkey/requester.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/blob/8812bfbf/cloudmonkey/requester.py ---------------------------------------------------------------------- diff --git a/cloudmonkey/requester.py b/cloudmonkey/requester.py index b0035d6..b55061f 100644 --- a/cloudmonkey/requester.py +++ b/cloudmonkey/requester.py @@ -129,7 +129,7 @@ def make_request_with_password(command, args, logger, url, credentials): def make_request(command, args, logger, host, port, - credentials, protocol, path): + credentials, protocol, path, expires): response = None error = None @@ -187,13 +187,13 @@ def make_request(command, args, logger, host, port, def monkeyrequest(command, args, isasync, asyncblock, logger, host, port, - credentials, timeout, protocol, path): + credentials, timeout, protocol, path, expires): response = None error = None logger_debug(logger, "======== START Request ========") logger_debug(logger, "Requesting command=%s, args=%s" % (command, args)) response, error = make_request(command, args, logger, host, - port, credentials, protocol, path) + port, credentials, protocol, path, expires) logger_debug(logger, "======== END Request ========\n")
