This closes #1276
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/99062d10 Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/99062d10 Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/99062d10 Branch: refs/heads/apex-runner Commit: 99062d103c96e47ea78fc866984195df12de7770 Parents: 6e1e57b 5dca267 Author: Thomas Groh <tg...@google.com> Authored: Fri Nov 4 13:05:21 2016 -0700 Committer: Thomas Groh <tg...@google.com> Committed: Fri Nov 4 13:05:21 2016 -0700 ---------------------------------------------------------------------- .../beam/runners/direct/EvaluationContext.java | 6 +- .../direct/ExecutorServiceParallelExecutor.java | 41 ++++---- .../beam/runners/direct/WatermarkManager.java | 79 ++++++++------ .../runners/direct/EvaluationContextTest.java | 23 ++--- .../runners/direct/WatermarkManagerTest.java | 102 ++++++------------- 5 files changed, 109 insertions(+), 142 deletions(-) ----------------------------------------------------------------------
