diff --git a/common/lib/xmodule/xmodule/capa_base.py b/common/lib/xmodule/xmodule/capa_base.py index 6ee22958f176..88ffa339272e 100644 --- a/common/lib/xmodule/xmodule/capa_base.py +++ b/common/lib/xmodule/xmodule/capa_base.py @@ -885,7 +885,7 @@ def check_problem(self, data): event_info['failure'] = 'closed' self.runtime.track_function('problem_check_fail', event_info) if dog_stats_api: - dog_stats_api.increment(metric_name('checks'), [u'result:failed', u'failure:closed']) + dog_stats_api.increment(metric_name('checks'), tags=[u'result:failed', u'failure:closed']) raise NotFoundError(_("Problem is closed.")) # Problem submitted. Student should reset before checking again @@ -893,7 +893,7 @@ def check_problem(self, data): event_info['failure'] = 'unreset' self.runtime.track_function('problem_check_fail', event_info) if dog_stats_api: - dog_stats_api.increment(metric_name('checks'), [u'result:failed', u'failure:unreset']) + dog_stats_api.increment(metric_name('checks'), tags=[u'result:failed', u'failure:unreset']) raise NotFoundError(_("Problem must be reset before it can be checked again.")) # Problem queued. Students must wait a specified waittime before they are allowed to submit @@ -962,7 +962,7 @@ def check_problem(self, data): self.runtime.track_function('problem_check', event_info) if dog_stats_api: - dog_stats_api.increment(metric_name('checks'), [u'result:success']) + dog_stats_api.increment(metric_name('checks'), tags=[u'result:success']) dog_stats_api.histogram( metric_name('correct_pct'), float(published_grade['grade']) / published_grade['max_grade'], diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index ed0ca12400bf..4abf3075a2a4 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -26,7 +26,7 @@ -e git+https://github.com/edx/bok-choy.git@25a47b3bf87c503fc4996e52addac83b42ec6f38#egg=bok_choy -e git+https://github.com/edx-solutions/django-splash.git@9965a53c269666a30bb4e2b3f6037c138aef2a55#egg=django-splash -e git+https://github.com/edx/acid-block.git@459aff7b63db8f2c5decd1755706c1a64fb4ebb1#egg=acid-xblock --e git+https://github.com/edx/edx-ora2.git@release-2014-04-07#egg=edx-ora2 +-e git+https://github.com/edx/edx-ora2.git@release-2014-04-08#egg=edx-ora2 # Prototype XBlocks for limited roll-outs and user testing. These are not for general use. -e git+https://github.com/pmitros/ConceptXBlock.git@2376fde9ebdd83684b78dde77ef96361c3bd1aa0#egg=concept-xblock