hg: jdk/sandbox: fix merge error

markus.gronlund at oracle.com markus.gronlund at oracle.com
Sun Aug 25 08:13:20 UTC 2019


Changeset: 7d2478b04e95
Author:    mgronlun
Date:      2019-08-25 10:12 +0200
URL:       https://hg.openjdk.java.net/jdk/sandbox/rev/7d2478b04e95

fix merge error

! src/hotspot/share/jfr/metadata/metadata.xml
! src/hotspot/share/jfr/periodic/jfrPeriodic.cpp



More information about the jdk-sandbox-changes mailing list