Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed build issues #691

Merged
merged 2 commits into from
Jan 8, 2016
Merged

Fixed build issues #691

merged 2 commits into from
Jan 8, 2016

Conversation

yceruto
Copy link
Contributor

@yceruto yceruto commented Jan 8, 2016

No description provided.

Default value: ``liip_imagine.controller:filterAction``
* ``filter_runtime_action`` - name of the controller action to use in the route
loader for runtimeconfig images. Default value: ``liip_imagine.controller:filterRuntimeAction``
* ``filter_action`` - name of the controller action to use in the route loader.
Copy link
Contributor

Choose a reason for hiding this comment

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

This error has also been fixed in #690 but using a different solution.

@javiereguiluz
Copy link
Contributor

👍 nice!

@makasim
Copy link
Collaborator

makasim commented Jan 8, 2016

@javiereguiluz should I merge this?

@javiereguiluz
Copy link
Contributor

I think so. And I'm going to partially revert my previous pull request to avoid conflicts.

makasim added a commit that referenced this pull request Jan 8, 2016
@makasim makasim merged commit f5341df into liip:master Jan 8, 2016
@makasim
Copy link
Collaborator

makasim commented Jan 8, 2016

Thanks @yceruto for the fix and @javiereguiluz for the review.

@yceruto yceruto deleted the fixed-build-issues branch December 20, 2016 14:47
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.

3 participants