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

Add usage indicators for the bundled JDK #40616

Merged
merged 11 commits into from
Mar 29, 2019
+107 −34
Merged

Add usage indicators for the bundled JDK #40616

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
39af408
Add usage indicators for the bundled JDK
jasontedor Mar 28, 2019
80a03f4
Clarify
jasontedor Mar 28, 2019
f87e3cf
Forbidden!
jasontedor Mar 28, 2019
8fc5cdb
Refinement
jasontedor Mar 29, 2019
a54784f
Fix tests
jasontedor Mar 29, 2019
672145c
Fix docs test
jasontedor Mar 29, 2019
8097510
Update values
jasontedor Mar 29, 2019
19ca7bf
Fix typo
jasontedor Mar 29, 2019
8222cf8
Fix test
jasontedor Mar 29, 2019
6784603
Disable BWC
jasontedor Mar 29, 2019
1694311
Merge remote-tracking branch 'elastic/master' into bundled-usage
jasontedor Mar 29, 2019
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
Prev Previous commit
Next Next commit
Fix tests
@jasontedor
jasontedor committed Mar 29, 2019

Verified

This commit was signed with the committer’s verified signature.
Kobzol Jakub Beránek
GPG key ID: 909CD0D26483516B
Verified
Learn about vigilant mode
commit a54784f22784307bf41b2ab1d2977269a021a655
2 changes: 1 addition & 1 deletion server/src/main/java/org/elasticsearch/monitor/jvm/JvmInfo.java
View file
Original file line number Diff line number Diff line change
@@ -154,7 +154,7 @@ public class JvmInfo implements Writeable, ToXContentFragment {

}

final boolean bundledJdk = Booleans.parseBoolean(System.getProperty("es.bundled_jdk"));
final boolean bundledJdk = Booleans.parseBoolean(System.getProperty("es.bundled_jdk", Boolean.FALSE.toString()));
final Boolean usingBundledJdk = bundledJdk ? usingBundledJdk() : null;

INSTANCE = new JvmInfo(JvmPid.getPid(), System.getProperty("java.version"), runtimeMXBean.getVmName(), runtimeMXBean.getVmVersion(),