Skip to content

Conversation

@nemoDreamer
Copy link
Contributor

@nemoDreamernemoDreamerforce-pushed the ticket/28817_fix_api_tests_for_new_features branch from f4a5909 to 7a26d76CompareMarch 25, 2015 00:02
Copy link
ContributorAuthor

Choose a reason for hiding this comment

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

@manneohrstrom, I'd been tasked w/ fixing this, and only saw much later that you'd fixed the project aspect of this...
So this is the conflict resolution, I hope you don't mind I kept "mine", since I'd already cherry-picked my ensure_... changes over from #79...

Copy link
Contributor

Choose a reason for hiding this comment

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

No worries at all - this was just a quick fix to get the tests working on older servers. Looks like you have done a much more holistic pass, trying to clean things up properly (which is totally awesome!). So please ignore/discard any of my changes in favour of your proper changes. This was just a quick fix to make sure we can release the API with all tests passing.

@nemoDreamernemoDreamerforce-pushed the ticket/28817_fix_api_tests_for_new_features branch from 7a26d76 to 14e283eCompareMarch 25, 2015 00:15
@nemoDreamernemoDreamerforce-pushed the ticket/28817_fix_api_tests_for_new_features branch from 14e283e to 7963a06CompareMarch 25, 2015 18:46
nemoDreamer added a commit that referenced this pull request Mar 25, 2015
…s_for_new_features Ticket/28817 fix api tests for new features
@nemoDreamernemoDreamer merged commit c1d5967 into masterMar 25, 2015
@nemoDreamernemoDreamer deleted the ticket/28817_fix_api_tests_for_new_features branch March 25, 2015 19:04
@francoisjacques
Copy link
Contributor

Awesome !!

Sign up for freeto 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.

4 participants

@nemoDreamer@francoisjacques@manneohrstrom