X Tutup
Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: vurt/docker-java
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: vurt/docker-java
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2.x
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 8 commits
  • 11 files changed
  • 2 contributors

Commits on Jan 11, 2016

  1. [maven-release-plugin] prepare release docker-java-2.1.4

    Marcus Linke committed Jan 11, 2016
    Configuration menu
    Copy the full SHA
    0914b45 View commit details
    Browse the repository at this point in the history

  2. [maven-release-plugin] prepare for next development iteration

    Marcus Linke committed Jan 11, 2016
    Configuration menu
    Copy the full SHA
    05aa9ad View commit details
    Browse the repository at this point in the history

  3. Update CHANGELOG.md

    @marcuslinke
    marcuslinke committed Jan 11, 2016
    Configuration menu
    Copy the full SHA
    7c8740e View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2016

  1. Enable all tests again

    Marcus Linke committed Jan 20, 2016
    Configuration menu
    Copy the full SHA
    dad57f9 View commit details
    Browse the repository at this point in the history

  2. Catch NotFoundException 

    Conflicts:
	src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
    Marcus Linke committed Jan 20, 2016
    Configuration menu
    Copy the full SHA
    b362f1c View commit details
    Browse the repository at this point in the history

  3. Fix removeImage test: Don't kill already stopped container 

    Conflicts:
	src/test/java/com/github/dockerjava/netty/exec/RemoveImageCmdExecTest.java
    Marcus Linke committed Jan 20, 2016
    Configuration menu
    Copy the full SHA
    1eaa75a View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2016

  1. Fix issue docker-java#424 

    Conflicts:
	src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java
	src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java
	src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java
	src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java
	src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java
	src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java
	src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java
	src/test/java/com/github/dockerjava/netty/exec/InspectExecCmdExecTest.java
    Marcus Linke committed Jan 21, 2016
    Configuration menu
    Copy the full SHA
    42f4670 View commit details
    Browse the repository at this point in the history

  2. Update CHANGELOG.md

    @marcuslinke
    marcuslinke committed Jan 21, 2016
    Configuration menu
    Copy the full SHA
    aa38878 View commit details
    Browse the repository at this point in the history
Loading
X Tutup