Skip to content
This repository has been archived by the owner on Jun 22, 2018. It is now read-only.

Commit

Permalink
Updated CHANGELOG
Browse files Browse the repository at this point in the history
  • Loading branch information
frankscholten committed Sep 9, 2015
1 parent 8b50fbd commit 051f7b6
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 8 deletions.
8 changes: 4 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [0.2.6] - [6 September 2015]
## [0.2.8] - [9 September 2015]

### Added

- [Print container logs when it fails to start](https://github.com/ContainerSolutions/mini-mesos/pull/54)
- [Allow passing extra environment variables to supervised programs](https://github.com/ContainerSolutions/mini-mesos/pull/61)

## [0.2.8] - [9 September 2015]
## [0.2.6] - [6 September 2015]

### Added

- [Allow passing extra environment variables to supervised programs](https://github.com/ContainerSolutions/mini-mesos/pull/61)
- [Print container logs when it fails to start](https://github.com/ContainerSolutions/mini-mesos/pull/54)
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public MesosCluster build() {
}
}

return new MesosCluster(new MesosClusterConfig(dockerClient, numberOfSlaves, slaveResources, mesosMasterPort, privateRegistryPort));
return new MesosCluster(new MesosClusterConfig(dockerClient, numberOfSlaves, slaveResources, mesosMasterPort, privateRegistryPort, extraEnvironmentVariables));
}
}

Expand Down
3 changes: 0 additions & 3 deletions src/main/java/org/apache/mesos/mini/mesos/MesosContainer.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,10 @@
import java.io.IOException;
import java.net.Socket;
import java.security.SecureRandom;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
import java.util.concurrent.Callable;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;

import static com.jayway.awaitility.Awaitility.await;

Expand Down

0 comments on commit 051f7b6

Please sign in to comment.