Return-Path: <commits-return-29135-archive-asf-public=cust-asf.ponee.io@beam.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id DCA11200C5D
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Fri,  7 Apr 2017 17:12:33 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id DB189160BA2; Fri,  7 Apr 2017 15:12:33 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 370C2160B93
	for <archive-asf-public@cust-asf.ponee.io>; Fri,  7 Apr 2017 17:12:33 +0200 (CEST)
Received: (qmail 12165 invoked by uid 500); 7 Apr 2017 15:12:31 -0000
Mailing-List: contact commits-help@beam.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@beam.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@beam.apache.org>
List-Post: <mailto:commits@beam.apache.org>
List-Id: <commits.beam.apache.org>
Reply-To: dev@beam.apache.org
Delivered-To: mailing list commits@beam.apache.org
Received: (qmail 12155 invoked by uid 99); 7 Apr 2017 15:12:31 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Apr 2017 15:12:31 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id AB5D2E0F98; Fri,  7 Apr 2017 15:12:31 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: davor@apache.org
To: commits@beam.apache.org
Date: Fri, 07 Apr 2017 15:12:31 -0000
Message-Id: <b16e2fb5973a4b7b870e08ea157da9bb@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [1/2] beam git commit: BEAM-1851: Update documentation for for
 fixedSizeGlobally to be clear about memory constraints.
archived-at: Fri, 07 Apr 2017 15:12:34 -0000

Repository: beam
Updated Branches:
  refs/heads/master a8edbb81f -> e0df45850


BEAM-1851: Update documentation for for fixedSizeGlobally to be clear about memory constraints.


Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/5b1d73fe
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/5b1d73fe
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/5b1d73fe

Branch: refs/heads/master
Commit: 5b1d73fee3994784fd826aea1a7fc81c261d093f
Parents: a8edbb8
Author: mdshalda <mdshalda@gmail.com>
Authored: Wed Apr 5 22:23:00 2017 -0700
Committer: Davor Bonaci <davor@google.com>
Committed: Fri Apr 7 17:12:06 2017 +0200

----------------------------------------------------------------------
 .../src/main/java/org/apache/beam/sdk/transforms/Sample.java     | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam/blob/5b1d73fe/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Sample.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Sample.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Sample.java
index 3d35c80..f3bd07a 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Sample.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Sample.java
@@ -81,6 +81,10 @@ public class Sample {
    * selected elements. If the input {@code PCollection} has fewer than {@code sampleSize} elements,
    * then the output {@code Iterable<T>} will be all the input's elements.
    *
+   * <p>All of the elements of the output {@code PCollection} should fit into
+   * main memory of a single worker machine.  This operation does not
+   * run in parallel.
+   *
    * <p>Example of use:
    *
    * <pre>{@code