Results of resetting test DB - #11278
Closed
efischer19 wants to merge 1 commit into
Closed
Conversation
Contributor
Author
|
Spoke with @jzoldak offline, I'll undelete the lettuce db and get this merged. |
efischer19
force-pushed
the
efischer/bok_choy_fix
branch
from
January 20, 2016 19:34
5a915b3 to
18853fb
Compare
Contributor
Author
|
@jzoldak and @benpatterson This has been updated to be a merge-able diff, I'll wait for your go-ahead and green tests before merging. Thanks for the help on this! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
@jzoldak @benpatterson These are files that changed when I followed the guidelines at https://openedx.atlassian.net/wiki/display/~zoldak/How+to+do+common+administrative+stuff/ to get bok-choy tests running on the latest master code.
Is this type of thing usually merged back into master? I was getting this error before: