# HG changeset patch
# User amurillo
# Date 1465232283 25200
# Node ID bbb89d6c08ccba0a6a9ef2013b84d2d9f4508d70
# Parent  ced9f79a0d3f2131b34f9d9f1a0e3b6aca4d1fd1# Parent  11af6696675cadc6570ac66d4fe03b62814581f7
Merge

diff -r ced9f79a0d3f -r bbb89d6c08cc .hgtags-top-repo
--- a/.hgtags-top-repo	Thu Jun 02 14:58:48 2016 -0700
+++ b/.hgtags-top-repo	Mon Jun 06 09:58:03 2016 -0700
@@ -363,3 +363,4 @@
 047f95de8f918d8ff5e8cd2636a2abb5c3c8adb8 jdk-9+118
 3463a3f14f0f0e8a68f29ac6405454f2fa2f598a jdk-9+119
 647e0142a5a52749db572b5e6638d561def6479e jdk-9+120
+cae471d3b87783e0a3deea658e1e1c84b2485b6c jdk-9+121
diff -r ced9f79a0d3f -r bbb89d6c08cc common/conf/jib-profiles.js
--- a/common/conf/jib-profiles.js	Thu Jun 02 14:58:48 2016 -0700
+++ b/common/conf/jib-profiles.js	Mon Jun 06 09:58:03 2016 -0700
@@ -318,7 +318,8 @@
         },
 
         "linux-x86-open": {
-            default_make_targets: "profiles"
+            default_make_targets: "profiles",
+            configure_args: "--with-jvm-variants=client,server"
         }
     };
     var openOnlyProfiles = concatObjects(openOnlyProfiles, openOnlyProfilesExtra);