# HG changeset patch # User jiangli # Date 1448318567 -3600 # Node ID 91e2439320120855bf1e00952c05fe442eb42d33 # Parent 3396ae214e7d4fb7111cf1d86b1f327d405bd935# Parent ee671d00723e2bd6620258d4c0d0f02685e56289 Merge diff -r 3396ae214e7d -r 91e243932012 jdk/make/src/classes/build/tools/module/boot.modules --- a/jdk/make/src/classes/build/tools/module/boot.modules Mon Nov 23 12:44:50 2015 -0800 +++ b/jdk/make/src/classes/build/tools/module/boot.modules Mon Nov 23 23:42:47 2015 +0100 @@ -19,6 +19,7 @@ jdk.charsets jdk.deploy jdk.deploy.osx +jdk.vm.cds jdk.httpserver jdk.jfr jdk.management