diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-26 16:29:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-26 16:29:16 +0000 |
| commit | 90607d0a92f5bbead87d1f724f69dcabfc5b473e (patch) | |
| tree | b750c3557ba3eadda0c7ce79017accd6ab107cc8 /nova/db | |
| parent | 028bf2184922a263a5a72b1b81bd727a4558764f (diff) | |
| parent | 6859f5e843a3a0cbee644661ca8b9cb1c88894a0 (diff) | |
Merge "Fixes task_log_get and task_log_get_all signatures"
Diffstat (limited to 'nova/db')
| -rw-r--r-- | nova/db/api.py | 20 | ||||
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 8 |
2 files changed, 12 insertions, 16 deletions
diff --git a/nova/db/api.py b/nova/db/api.py index d8a16c52d..6af81e5f9 100644 --- a/nova/db/api.py +++ b/nova/db/api.py @@ -1705,16 +1705,14 @@ def task_log_end_task(context, task_name, period_ending, host, errors, - message=None, - session=None): + message=None): """Mark a task as complete for a given host/time period.""" return IMPL.task_log_end_task(context, task_name, period_beginning, period_ending, host, errors, - message, - session) + message) def task_log_begin_task(context, task_name, @@ -1722,25 +1720,23 @@ def task_log_begin_task(context, task_name, period_ending, host, task_items=None, - message=None, - session=None): + message=None): """Mark a task as started for a given host/time period.""" return IMPL.task_log_begin_task(context, task_name, period_beginning, period_ending, host, task_items, - message, - session) + message) def task_log_get_all(context, task_name, period_beginning, - period_ending, host=None, state=None, session=None): + period_ending, host=None, state=None): return IMPL.task_log_get_all(context, task_name, period_beginning, - period_ending, host, state, session) + period_ending, host, state) def task_log_get(context, task_name, period_beginning, - period_ending, host, state=None, session=None): + period_ending, host, state=None): return IMPL.task_log_get(context, task_name, period_beginning, - period_ending, host, state, session) + period_ending, host, state) diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 75e614522..a6f585eef 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -4772,15 +4772,15 @@ def _task_log_get_query(context, task_name, period_beginning, @require_admin_context def task_log_get(context, task_name, period_beginning, period_ending, host, state=None): - return _task_log_get_query(task_name, period_beginning, period_ending, - host, state).first() + return _task_log_get_query(context, task_name, period_beginning, + period_ending, host, state).first() @require_admin_context def task_log_get_all(context, task_name, period_beginning, period_ending, host=None, state=None): - return _task_log_get_query(task_name, period_beginning, period_ending, - host, state).all() + return _task_log_get_query(context, task_name, period_beginning, + period_ending, host, state).all() @require_admin_context |