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

[7.x] Fix conflict between timelion.ui.enabled yml setting and timelion feature control (#35266) #35765

Merged
merged 1 commit into from
Apr 30, 2019

Conversation

lukeelmers
Copy link
Member

Backports the following commits to 7.x:

…ture control (elastic#35266)

* Merge duplicate injectDefaultVars in timelion plugin definition.

* Enable timelion app in x-pack functional tests.
@elasticmachine
Copy link
Contributor

💚 Build Succeeded

@lukeelmers lukeelmers merged commit d0a9881 into elastic:7.x Apr 30, 2019
@lukeelmers lukeelmers deleted the backport/7.x/pr-35266 branch April 30, 2019 00:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants