hg: jdk7u/jdk7u-dev/jdk: 2 new changesets

[sean.coffey at oracle.com]

Changeset: 2b595d4b5986
Author:    michaelm
Date:      2014-11-04 17:08 +0000
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u-dev/jdk/rev/2b595d4b5986

8062744: jdk.net.Sockets.setOption/getOption does not support IP_TOS
Reviewed-by: chegar, alanb

! src/share/classes/jdk/net/Sockets.java
+ test/jdk/net/Sockets/SupportedOptions.java

Changeset: b93731db7aae
Author:    coffeys
Date:      2014-11-05 09:01 +0000
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u-dev/jdk/rev/b93731db7aae

Merge