[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openjdk-build-infra-dev
Subject:    hg: build-infra/jdk9: 6 new changesets
From:       magnus.ihse.bursie () oracle ! com
Date:       2014-12-05 14:29:58
Message-ID: 201412051429.sB5ETxLb007735 () aojmv0008
[Download RAW message or body]

Changeset: 5ea84bf087c5
Author:    katleman
Date:      2014-12-04 12:58 -0800
URL:       http://hg.openjdk.java.net/build-infra/jdk9/rev/5ea84bf087c5

Added tag jdk9-b41 for changeset 67395f7ca2db

! .hgtags

Changeset: f7c11da0b048
Author:    lana
Date:      2014-12-04 15:21 -0800
URL:       http://hg.openjdk.java.net/build-infra/jdk9/rev/f7c11da0b048

Merge


Changeset: 54e63b0b336e
Author:    ihse
Date:      2014-12-05 15:12 +0100
URL:       http://hg.openjdk.java.net/build-infra/jdk9/rev/54e63b0b336e

8066769: Fix merge errors following JDK-8049367 (modular images)
Reviewed-by: erikj

! common/bin/compare.sh
! make/Images.gmk
! make/MakeHelpers.gmk
! make/ModuleWrapper.gmk

Changeset: 38164424337d
Author:    ihse
Date:      2014-12-05 15:15 +0100
URL:       http://hg.openjdk.java.net/build-infra/jdk9/rev/38164424337d

Merge

! common/bin/compare.sh

Changeset: 7e2cf1f14863
Author:    ihse
Date:      2014-12-05 15:27 +0100
URL:       http://hg.openjdk.java.net/build-infra/jdk9/rev/7e2cf1f14863

Make compare.sh work with both old and new deploy image structure (deploy vs
deploy/images). Not very elegant solution :-(

! common/bin/compare.sh

Changeset: 1ba07e44f027
Author:    ihse
Date:      2014-12-05 15:29 +0100
URL:       http://hg.openjdk.java.net/build-infra/jdk9/rev/1ba07e44f027

Merge

! common/bin/compare.sh
! make/MakeHelpers.gmk

[prev in list] [next in list] [prev in thread] [next in thread]