hg: lambda/lambda/jdk: 2 new changesets

[brian.goetz at oracle.com]

Changeset: 334364b232d9
Author:    briangoetz
Date:      2013-03-22 16:10 -0400
URL:       http://hg.openjdk.java.net/lambda/lambda/jdk/rev/334364b232d9

Disambiguate map and flatMap methods with mapToXxx for methods that change the type of the stream

! src/share/classes/java/util/stream/DelegatingStream.java
! src/share/classes/java/util/stream/DoublePipeline.java
! src/share/classes/java/util/stream/DoubleStream.java
! src/share/classes/java/util/stream/IntPipeline.java
! src/share/classes/java/util/stream/IntStream.java
! src/share/classes/java/util/stream/IntermediateOp.java
! src/share/classes/java/util/stream/LongPipeline.java
! src/share/classes/java/util/stream/LongStream.java
! src/share/classes/java/util/stream/Nodes.java
! src/share/classes/java/util/stream/ReferencePipeline.java
! src/share/classes/java/util/stream/Sink.java
! src/share/classes/java/util/stream/Stream.java
! src/share/classes/java/util/stream/StreamShape.java
! src/share/classes/java/util/stream/Streams.java
! src/share/classes/java/util/stream/package-info.java
! test-ng/boottests/java/util/stream/StreamReuseTest.java
! test-ng/tests/org/openjdk/tests/java/util/BitsetStreamTest.java
! test-ng/tests/org/openjdk/tests/java/util/stream/DoublePrimitiveOpsTests.java
! test-ng/tests/org/openjdk/tests/java/util/stream/GroupByOpTest.java
! test-ng/tests/org/openjdk/tests/java/util/stream/InfiniteStreamWithLimitOpTest.java
! test-ng/tests/org/openjdk/tests/java/util/stream/IntPrimitiveOpsTests.java
! test-ng/tests/org/openjdk/tests/java/util/stream/LongPrimitiveOpsTests.java
! test-ng/tests/org/openjdk/tests/java/util/stream/MapOpTest.java
! test-ng/tests/org/openjdk/tests/java/util/stream/ToArrayOpTest.java
! test/java/io/BufferedReader/Lines.java
! test/java/nio/file/DirectoryStream/Entries.java
! test/java/nio/file/Files/StreamTest.java
! test/java/util/stream/Stream/IntStreamTest.java
! test/java/util/stream/Stream/IntegerStreamTest.java

Changeset: e7e7b0a6ee0b
Author:    briangoetz
Date:      2013-03-22 16:12 -0400
URL:       http://hg.openjdk.java.net/lambda/lambda/jdk/rev/e7e7b0a6ee0b

Merge