Check if we have tried, pause if we have
retention strategy needs to wait for the retry to happen before just shutting down the node
Added 'volumes-from' functionality
Add a new feature that allows you to add a build step of constructing
a docker image from a Dockerfile, and optionally push that image to
a registry.

This is particularly useful if your slaves themselves don't run docker
(or docker-in-docker), as no client-side tools are neccessary.


Signed-off-by: Nigel Magnay <nigel.magnay@gmail.com>
Merge pull request #48 from DustinChaloupka/retry-ssh

Check if we have tried, pause if we have
Merge pull request #46 from alonl/master

Added 'volumes-from' functionality
Variables need to be public if the UI is to work right.

Only set timeouts if we hae specified them.

Signed-off-by: Nigel Magnay <nigel.magnay@gmail.com>
Fixes for the builder publisher.

Signed-off-by: Nigel Magnay <nigel.magnay@gmail.com>
Add timeout for a slave that gets provisioned but then has no work

Resolves effect of #54

Also fix DockerTemplateTest

This was broken before by #46, but also needed to be updated for my changes
Fix a discrepancy with untied jobs

The plugin advertised supporting untied jobs but then all slaves were
EXCLUSIVE

Fixes the root cause of #54
[Fixed #64] Fix storing of cloudName and templateId variables
Merge pull request #62 from thomassuckow/feature/normalMode

Fix a discrepancy with untied jobs
Merge pull request #61 from thomassuckow/feature/idleTimeout

Add timeout for a slave that gets provisioned but then has no work
Merge pull request #65 from vjuranek/issue_64

[Fixed #64] Fix storing of cloudName and templateId variables
Feature to delete images from repository when jenkins culls the job.

Bump to jDocker 1.5. Preparing for release..

Signed-off-by: Nigel Magnay <nigel.magnay@gmail.com>
[maven-release-plugin] prepare release docker-plugin-0.7
[maven-release-plugin] prepare for next development iteration
Adding support for using lxc conf options
Merge branch 'addlxcconf'

Conflicts:
	src/main/java/com/nirima/jenkins/plugins/docker/DockerCloud.java
	src/main/java/com/nirima/jenkins/plugins/docker/DockerComputer.java
	src/main/java/com/nirima/jenkins/plugins/docker/DockerComputerLauncher.java
	src/main/java/com/nirima/jenkins/plugins/docker/DockerRetentionStrategy.java
	src/main/java/com/nirima/jenkins/plugins/docker/DockerTemplate.java
	src/main/java/com/nirima/jenkins/plugins/docker/builder/DockerBuilderNewTemplate.java
	src/main/java/com/nirima/jenkins/plugins/docker/utils/RetryingComputerLauncher.java
	src/test/java/com/nirima/jenkins/plugins/docker/DockerTemplateTest.java