changeset 2181:ff58cb77610f

Merge
author mchung
date Thu, 18 May 2017 14:18:16 -0700
parents fc416270a776 85cc76af3c6c
children 3e76e17ddd2a
files .hgtags
diffstat 2 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu May 18 14:54:56 2017 +0000
+++ b/.hgtags	Thu May 18 14:18:16 2017 -0700
@@ -383,6 +383,7 @@
 9e86d6383456a1eb0298c72bb9ca363939ad90cf jdk-9+147
 0a4bc2f049132ddc20985565bb41b2be8a458dda jdk-9+148
 c281306d33d83c92e0d870ace385d5f99678d7e7 jdk-9+149
+9488d434850ac9f40a59d192659c746f4ee2f4da jpms-edr
 ace1d994bca775d6545a4c874ae73d1dfc9ec18b jdk-9+150
 2a0437036a64853334e538044eb68d2df70075fa jdk-9+151
 ddc52e72757086a75a54371e8e7f56a3f89f1e55 jdk-9+152
@@ -394,10 +395,12 @@
 13ae2480a4c395026b3aa1739e0f9895dc8b25d9 jdk-9+158
 d75af059cff651c1b5cccfeb4c9ea8d054b28cfd jdk-9+159
 9d4dbb8cbe7ce321c6e9e34dc9e0974760710907 jdk-9+160
+4f15241136156c2b396526210b398d4a627d77f1 jpms-pr
 d6ef419af865dccf1e5be8047b0aba09286ffa93 jdk-9+161
 2cd29b339692524de64d049b329873facaff9727 jdk-9+162
 5e5e436543daea0c174d878d5e3ff8dd791e538a jdk-9+163
 b473fab09baab51a06ffba02eb06c7f5ee8578f7 jdk-9+164
+b3ea15f8d67db5507f1fe49caed01494ec3c7de6 jpms-pr2
 e36e62d3ea53c316f295b37bcc19867fbf510235 jdk-9+165
 5b2e7b2101c0048ba9f1df722e56611f523fdfe8 jdk-9+166
 e118c818dbf84d15191414c453b77c089116fdc0 jdk-9+167
--- a/.jcheck/conf	Thu May 18 14:54:56 2017 +0000
+++ b/.jcheck/conf	Thu May 18 14:18:16 2017 -0700
@@ -1,1 +1,4 @@
 project=jdk9
+comments=lax
+tags=lax
+bugids=dup