Skip to content

Refactoring of streaming commands APIs (event, stats, log, attach) - #263

Merged
marcuslinke merged 9 commits into
masterfrom
refact-streaming
Jul 7, 2015
Merged

Refactoring of streaming commands APIs (event, stats, log, attach)#263
marcuslinke merged 9 commits into
masterfrom
refact-streaming

Conversation

@marcuslinke

Copy link
Copy Markdown
Contributor

No description provided.

Marcus Linke added 9 commits May 17, 2015 20:55
Conflicts:
	src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
	src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
Conflicts:
	src/main/java/com/github/dockerjava/api/DockerClient.java
	src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
	src/main/java/com/github/dockerjava/api/command/EventCallback.java
	src/main/java/com/github/dockerjava/api/command/EventsCmd.java
	src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
	src/main/java/com/github/dockerjava/api/command/StatsCallback.java
	src/main/java/com/github/dockerjava/api/command/StatsCmd.java
	src/main/java/com/github/dockerjava/api/model/StreamType.java
	src/main/java/com/github/dockerjava/core/DockerClientImpl.java
	src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
	src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java
	src/main/java/com/github/dockerjava/core/command/FrameReader.java
	src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
	src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java
	src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
	src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
	src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
	src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java
	src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java
	src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
	src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
	src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
	src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
	src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
	src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
	src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java
marcuslinke added a commit that referenced this pull request Jul 7, 2015
Refactoring of streaming commands APIs (event, stats, log, attach)
@marcuslinke
marcuslinke merged commit 0c90737 into master Jul 7, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant