Merge jdk8-b126

Fri, 24 Jan 2014 04:45:02 -0800

author
katleman
date
Fri, 24 Jan 2014 04:45:02 -0800
changeset 944
9ccce5bf1b0e
parent 943
1b5d578f93ef
parent 935
7238a870ddb7
child 945
4f8fa4724c14

Merge

     1.1 --- a/common/autoconf/spec.gmk.in	Wed Jan 22 14:06:30 2014 -0800
     1.2 +++ b/common/autoconf/spec.gmk.in	Fri Jan 24 04:45:02 2014 -0800
     1.3 @@ -170,7 +170,7 @@
     1.4  COOKED_BUILD_NUMBER:=@COOKED_BUILD_NUMBER@
     1.5  # These variables need to be generated here so that MILESTONE and
     1.6  # JDK_BUILD_NUMBER can be overridden on the make command line.
     1.7 -ifeq ($(MILESTONE),)
     1.8 +ifeq ($(MILESTONE), fcs)
     1.9    RELEASE=$(JDK_VERSION)$(BUILD_VARIANT_RELEASE)
    1.10  else
    1.11    RELEASE=$(JDK_VERSION)-$(MILESTONE)$(BUILD_VARIANT_RELEASE)

mercurial