Skip to content

E0d/release merge - #1960

Merged
e0d merged 14 commits into
masterfrom
e0d/release-merge
Dec 16, 2013
Merged

E0d/release merge#1960
e0d merged 14 commits into
masterfrom
e0d/release-merge

Conversation

@e0d

@e0d e0d commented Dec 16, 2013

Copy link
Copy Markdown
Contributor

@jarv @polesye @dmitchell @jzoldak

Please review this updated PR and new branch. If things look good, I'll merge to master and create the release branch.

@dmitchell

Copy link
Copy Markdown
Contributor

👍

Comment thread cms/djangoapps/auth/authz.py Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this needs to be FEATURES not MITX_FEATURES

@polesye

polesye commented Dec 16, 2013

Copy link
Copy Markdown
Contributor

👍

@jzoldak

jzoldak commented Dec 16, 2013

Copy link
Copy Markdown
Contributor

lgtm 👍

@adampalay

Copy link
Copy Markdown
Contributor

@e0d , we don't want commit 76c8a7a

@stephensanchez

Copy link
Copy Markdown
Contributor

@waheedahmed @symbolist
There are a few changes in this merge around open ended grading, could you take a look and make sure this merge is correct according to your fixes on release?

@symbolist

Copy link
Copy Markdown
Contributor

👍

@e0d

e0d commented Dec 16, 2013

Copy link
Copy Markdown
Contributor Author

I've re-run the test that failed manually and it passed. This looks like an ephemeral issue.

https://jenkins.testeng.edx.org/job/edx-acceptance-manual-commit/53/console

e0d pushed a commit that referenced this pull request Dec 16, 2013
@e0d
e0d merged commit 4de51c8 into master Dec 16, 2013
@e0d
e0d deleted the e0d/release-merge branch December 16, 2013 22:08
jenkins-ks pushed a commit to nttks/edx-platform that referenced this pull request Jul 14, 2017
* change biz message openedx#1874

*  Implements bulk operation for biz openedx#1874
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.