apex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [4/4] incubator-apex-core git commit: Merge branch 'APEXCORE-269' of https://github.com/vrozov/incubator-apex-core
Date Sun, 28 Feb 2016 06:50:44 GMT
Merge branch 'APEXCORE-269' of https://github.com/vrozov/incubator-apex-core

Conflicts:
	engine/pom.xml


Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/c2eb06c6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/c2eb06c6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/c2eb06c6

Branch: refs/heads/master
Commit: c2eb06c686e93419764140a0e07b046a73d172be
Parents: 99466a3 d5c29fe
Author: Thomas Weise <thomas@datatorrent.com>
Authored: Sat Feb 27 22:49:43 2016 -0800
Committer: Thomas Weise <thomas@datatorrent.com>
Committed: Sat Feb 27 22:49:43 2016 -0800

----------------------------------------------------------------------
 engine/pom.xml                                  |   5 +
 .../java/com/datatorrent/stram/StramClient.java |   3 +-
 .../stram/debug/TappedReservoir.java            |  10 +-
 .../stram/engine/AbstractReservoir.java         | 786 +++++++++++++++++++
 .../stram/engine/DefaultReservoir.java          | 106 ---
 .../stram/engine/ForwardingReservoir.java       |  99 +++
 .../datatorrent/stram/engine/GenericNode.java   |  16 +-
 .../datatorrent/stram/engine/MuxReservoir.java  |  35 +-
 .../com/datatorrent/stram/engine/Reservoir.java |  22 +-
 .../stram/engine/SweepableReservoir.java        |  10 +-
 .../stram/engine/WindowGenerator.java           |  30 +-
 .../engine/WindowIdActivatedReservoir.java      |  10 +-
 .../stram/stream/BufferServerSubscriber.java    |  16 +
 .../datatorrent/stram/stream/InlineStream.java  |   9 +-
 .../com/datatorrent/stram/stream/OiOStream.java |   8 +-
 .../stram/engine/AbstractReservoirTest.java     | 362 +++++++++
 .../stram/engine/AtMostOnceTest.java            |   4 +-
 .../stram/engine/GenericNodeTest.java           |   8 +-
 .../datatorrent/stram/engine/InputNodeTest.java |   8 +-
 .../stram/engine/ProcessingModeTests.java       |   4 +-
 .../stram/stream/InlineStreamTest.java          |   6 +-
 pom.xml                                         |   6 +
 22 files changed, 1386 insertions(+), 177 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/c2eb06c6/engine/pom.xml
----------------------------------------------------------------------
diff --cc engine/pom.xml
index a0b108c,53376c8..277a770
--- a/engine/pom.xml
+++ b/engine/pom.xml
@@@ -329,35 -319,10 +329,40 @@@
        <version>4.3</version>
      </dependency>
      <dependency>
+       <groupId>org.jctools</groupId>
+       <artifactId>jctools-core</artifactId>
+       <version>1.1</version>
+     </dependency>
++    <dependency>
 +      <groupId>org.apache.maven</groupId>
 +      <artifactId>maven-embedder</artifactId>
 +      <version>3.3.9</version>
 +      <scope>test</scope>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.eclipse.aether</groupId>
 +      <artifactId>aether-connector-basic</artifactId>
 +      <version>1.0.2.v20150114</version>
 +      <scope>test</scope>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.eclipse.aether</groupId>
 +      <artifactId>aether-transport-wagon</artifactId>
 +      <version>1.0.2.v20150114</version>
 +      <scope>test</scope>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.maven.wagon</groupId>
 +      <artifactId>wagon-http</artifactId>
 +      <version>2.10</version>
 +      <scope>test</scope>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.maven.wagon</groupId>
 +      <artifactId>wagon-provider-api</artifactId>
 +      <version>2.10</version>
 +      <scope>test</scope>
 +    </dependency>
    </dependencies>
    <profiles>
      <profile>

http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/c2eb06c6/engine/src/main/java/com/datatorrent/stram/StramClient.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/c2eb06c6/engine/src/main/java/com/datatorrent/stram/engine/GenericNode.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/c2eb06c6/engine/src/test/java/com/datatorrent/stram/engine/GenericNodeTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/c2eb06c6/pom.xml
----------------------------------------------------------------------


Mime
View raw message