Merge remote-tracking branch 'origin/master' into reportUnconnectedPorts (7b099195) · Commits · Nelson Tavares de Sousa / TeeTime-Framework · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

T

TeeTime-Framework
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

7b099195

Commit 7b099195 authored 9 years ago by Nelson Tavares de Sousa

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into reportUnconnectedPorts

Conflicts:
	src/main/java/teetime/framework/A3PipeInstantiation.java

parents 3b78bd60 bdd068dc

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/teetime/framework/A3PipeInstantiation.java 11 additions, 1 deletion

src/main/java/teetime/framework/A3PipeInstantiation.java
src/main/java/teetime/framework/AbstractStage.java 3 additions, 1 deletion

src/main/java/teetime/framework/AbstractStage.java
src/main/java/teetime/framework/InputPort.java 1 addition, 1 deletion

src/main/java/teetime/framework/InputPort.java
src/main/java/teetime/framework/OutputPort.java 1 addition, 1 deletion

src/main/java/teetime/framework/OutputPort.java
src/main/java/teetime/stage/InitialElementProducer.java 4 additions, 17 deletions

src/main/java/teetime/stage/InitialElementProducer.java
src/test/java/teetime/stage/InitialElementProducerTest.java 22 additions, 30 deletions

src/test/java/teetime/stage/InitialElementProducerTest.java

with 42 additions and 51 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment