Merge remote-tracking branch 'origin/master' into connector-survey
Conflicts: src/main/java/teetime/framework/pipe/InstantiationPipe.java
No related branches found
No related tags found
Showing
- src/main/java/teetime/framework/AbstractPipe.java 12 additions, 18 deletionssrc/main/java/teetime/framework/AbstractPipe.java
- src/main/java/teetime/framework/pipe/DummyPipe.java 0 additions, 7 deletionssrc/main/java/teetime/framework/pipe/DummyPipe.java
- src/main/java/teetime/framework/pipe/IPipe.java 0 additions, 4 deletionssrc/main/java/teetime/framework/pipe/IPipe.java
- src/main/java/teetime/framework/pipe/InstantiationPipe.java 1 addition, 6 deletionssrc/main/java/teetime/framework/pipe/InstantiationPipe.java
- src/main/java/teetime/framework/pipe/SingleElementPipe.java 0 additions, 6 deletionssrc/main/java/teetime/framework/pipe/SingleElementPipe.java
- src/main/java/teetime/framework/pipe/SpScPipe.java 0 additions, 7 deletionssrc/main/java/teetime/framework/pipe/SpScPipe.java
- src/main/java/teetime/stage/basic/distributor/Distributor.java 2 additions, 2 deletions...ain/java/teetime/stage/basic/distributor/Distributor.java
- src/test/java/teetime/framework/pipe/SpScPipeTest.java 1 addition, 1 deletionsrc/test/java/teetime/framework/pipe/SpScPipeTest.java
- src/test/java/teetime/stage/basic/merger/MergerTestingPipe.java 0 additions, 6 deletions...st/java/teetime/stage/basic/merger/MergerTestingPipe.java
Loading
Please register or sign in to comment