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.

Sign up for GitHub

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

Jump to bottom

Bump elasticsearch client #9446

Merged
merged 2 commits into from
Dec 13, 2016
Merged

Bump elasticsearch client #9446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c007b55
Bump elasticsearch client
jbudz Dec 12, 2016
2419fe3
Bump elasticsearch version in tests entry template to master
jbudz Dec 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@
"d3": "3.5.6",
"d3-cloud": "1.2.1",
"dragula": "3.7.0",
"elasticsearch": "12.0.0-rc5",
"elasticsearch-browser": "12.0.0-rc5",
"elasticsearch": "12.1.2",
"elasticsearch-browser": "12.1.2",
"encode-uri-query": "1.0.0",
"even-better": "7.0.2",
"expiry-js": "0.1.7",
Expand Down
2 changes: 1 addition & 1 deletion src/core_plugins/tests_bundle/tests_entry_template.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ window.__KBN__ = {
vars: {
kbnIndex: '.kibana',
esShardTimeout: 1500,
esApiVersion: '2.0',
esApiVersion: 'master',
Copy link
Contributor

@spalger spalger Dec 12, 2016 •
edited
Loading

Choose a reason for hiding this comment

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

This is less than idea, but ultimately true for master. @epixa can you think of a way to help remind whoever branches to 5.1, 5.2, etc. that this needs to be updated?

Copy link
Contributor

@epixa epixa Dec 12, 2016 •
edited
Loading

Choose a reason for hiding this comment

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

I was thinking about creating a top level versions file in the root of the project that we can use to track all specific versions like this, so bumping the Kibana version would all be done in the same file. That's separate from this PR, though.

Thoughts?

Copy link
Contributor

Choose a reason for hiding this comment

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

maybe we should just store it in package.json?

Copy link
Contributor

Choose a reason for hiding this comment

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

We have to hard-code the version there anyway

Copy link
Contributor

Choose a reason for hiding this comment

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

@jbudz Just ignore this comment chain for the sake of this PR.

@spalger Why do we need to hardcode the version in package.json? The version requirement is there for npm, which we don't publish Kibana to. We should be able to mark the package.json as private and remove the version entirely.

Copy link
Contributor

@spalger spalger Dec 13, 2016 •
edited
Loading

Choose a reason for hiding this comment

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

I'm pretty sure npm still complains, but I'm down. Then we can have a versions file separate from package.json

esRequestTimeout: '300000',
tilemap: {
url: 'https://tiles.elastic.co/v1/default/{z}/{x}/{y}.png?my_app_name=kibana&my_app_version=1.2.3&elastic_tile_service_tos=agree',
Expand Down