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: docker-java/docker-java
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 002b6eb
Choose a base ref
...
head repository: alien4cloud/docker-java
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3273164
Choose a head ref
  • 10 commits
  • 5 files changed
  • 3 contributors

Commits on Feb 3, 2017

  1. Issue 761: Inspect command response should include docker swarm node … 

    …info

#761

It is useful to be able to tell which node a container is running on for various scenarios such as routing traffic dynamically to it.

I've tested a change to add this information and will create a PR shortly.
    @loganbruns @vuminhkh
    loganbruns authored and vuminhkh committed Feb 3, 2017
    Configuration menu
    Copy the full SHA
    f4bf1f0 View commit details
    Browse the repository at this point in the history

  2. Change distribution management for custom docker-java version

    @vuminhkh
    vuminhkh committed Feb 3, 2017
    Configuration menu
    Copy the full SHA
    a64ea32 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2017

  1. Leave the responsibility to log error in the callback to end user

    @vuminhkh
    vuminhkh committed Feb 17, 2017
    Configuration menu
    Copy the full SHA
    bae42bc View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2017

  1. Prepare release temporary docker-java version

    @vuminhkh
    vuminhkh committed Feb 18, 2017
    Configuration menu
    Copy the full SHA
    9518ff1 View commit details
    Browse the repository at this point in the history

  2. Disable nexus staging plugin as it's not compatible with Fastconnect … 

    …Nexus
    @vuminhkh
    vuminhkh committed Feb 18, 2017
    Configuration menu
    Copy the full SHA
    715d683 View commit details
    Browse the repository at this point in the history

  3. Change pom back to development version

    @vuminhkh
    vuminhkh committed Feb 18, 2017
    Configuration menu
    Copy the full SHA
    e64cb8b View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2017

  1. Support for KQueue

    Luc Boutier committed Apr 12, 2017
    Configuration menu
    Copy the full SHA
    98a414b View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2017

  1. Merge branch 'master-docker-java' 

    * master-docker-java: (25 commits)
  Add some coding styles.
  Allow an explicit Dockerfile location string to be specified to the build command (#825)
  Proposed fix for #830 (#832)
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release 3.0.9
  Fix test.
  Update CHANGELOG.md
  Responce may contains token.
  adding support for unless-stopped restart policy
  Generate OSGi compliant manifest (#797)
  exclude commons-logging since docker-java uses slf4j/logback
  Unable to deserialize status response from amazon ECR login
  Ensure FakeDockerServer is started on a random free port
  Fixes #807. NettyDockerCmdExecFactory ignores API version configuration
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release 3.0.8
  Update CHANGELOG.md
  Added healthcheck support in container inspect JSON result
  Use TLSv2 by default
  rerun failing tests count to 3
  ...

# Conflicts:
#	pom.xml
    @vuminhkh
    vuminhkh committed Apr 29, 2017
    Configuration menu
    Copy the full SHA
    d1c1a46 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2017

  1. Prepare release docker-java with netty kqueue

    @vuminhkh
    vuminhkh committed Apr 30, 2017
    Configuration menu
    Copy the full SHA
    93fde8d View commit details
    Browse the repository at this point in the history

Commits on May 9, 2017

  1. Prepare Alien release 3.0.10-ALIEN2

    @vuminhkh
    vuminhkh committed May 9, 2017
    Configuration menu
    Copy the full SHA
    3273164 View commit details
    Browse the repository at this point in the history
Loading