fixes Bug fixed 1027653 - repaired config setup for fetch_adi_from_hive test #2134

Merged
merged 1 commit into from Jun 19, 2014

Conversation

Projects
None yet
3 participants
@twobraids
Contributor

twobraids commented Jun 19, 2014

It looks like there was a merge conflict and the wrong code was chosen as the winner of the merge.
The config setup for crontabber tests was changed to unify it for all tests. This test still had the old style and was therefore not picking up config info correctly.

@peterbe

This comment has been minimized.

Show comment
Hide comment
@peterbe

peterbe Jun 19, 2014

Contributor

Looks very familiar. r+ if leeroy is happy.

Contributor

peterbe commented Jun 19, 2014

Looks very familiar. r+ if leeroy is happy.

@adngdb

This comment has been minimized.

Show comment
Hide comment
@adngdb

adngdb Jun 19, 2014

Contributor

It's green! Yay!

Contributor

adngdb commented Jun 19, 2014

It's green! Yay!

adngdb added a commit that referenced this pull request Jun 19, 2014

Merge pull request #2134 from twobraids/fix-for-failing-fetch
fixes Bug fixed 1027653 - repaired config setup for fetch_adi_from_hive test

@adngdb adngdb merged commit 49e7209 into mozilla-services:master Jun 19, 2014

1 check passed

default Jenkins build 'socorro-github' #3521 has succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment