hg: type-annotations/type-annotations/corba: 2 new changesets

[wdietl at gmail.com]

Changeset: af8e5bc3a150
Author:    coffeys
Date:      2013-09-03 22:35 +0100
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/corba/rev/af8e5bc3a150

8017195: Introduce option to setKeepAlive parameter on CORBA sockets
Reviewed-by: chegar, msheppar

! src/share/classes/com/sun/corba/se/impl/transport/DefaultSocketFactoryImpl.java

Changeset: 66779fbebe03
Author:    wmdietl
Date:      2013-09-05 14:58 -0700
URL:       http://hg.openjdk.java.net/type-annotations/type-annotations/corba/rev/66779fbebe03

Automated merge with http://hg.openjdk.java.net/jdk8/tl/corba