Merge branch 'context-merging' into 'master' (ae7a4f22) · 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

ae7a4f22

Commit ae7a4f22 authored 9 years ago by Christian Wulf

Downloads
- Plain Diff

Merge branch 'context-merging' into 'master'

Context merging

fixes #192

See merge request !48

parents 05df0801 b37db75b

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

src/changes/changes.xml 1 addition, 2 deletions

src/changes/changes.xml
src/main/java/teetime/framework/AbstractCompositeStage.java 3 additions, 6 deletions

src/main/java/teetime/framework/AbstractCompositeStage.java
src/main/java/teetime/framework/Configuration.java 0 additions, 4 deletions

src/main/java/teetime/framework/Configuration.java
src/main/java/teetime/framework/ConfigurationContext.java 19 additions, 2 deletions

src/main/java/teetime/framework/ConfigurationContext.java
src/main/java/teetime/framework/Stage.java 2 additions, 0 deletions

src/main/java/teetime/framework/Stage.java
src/main/java/teetime/stage/io/EveryXthPrinter.java 1 addition, 3 deletions

src/main/java/teetime/stage/io/EveryXthPrinter.java
src/main/java/teetime/stage/string/WordCounter.java 1 addition, 3 deletions

src/main/java/teetime/stage/string/WordCounter.java
src/site/markdown/wiki 1 addition, 0 deletions

src/site/markdown/wiki
src/test/java/teetime/framework/AbstractCompositeStageTest.java 65 additions, 0 deletions

...st/java/teetime/framework/AbstractCompositeStageTest.java
src/test/java/teetime/framework/TraversorTest.java 1 addition, 1 deletion

src/test/java/teetime/framework/TraversorTest.java

with 94 additions and 21 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