summaryrefslogtreecommitdiffstats
path: root/docker-api
Commit message (Expand)AuthorAgeFilesLines
* Dont have to check if docker daemon is present inside every test - check is m...valerijf2016-10-171-14/+0
* testDockerLifecycle no longer tests networkvalerijf2016-10-171-72/+19
* Made testDockerNetworking() twice as fastvalerijf2016-10-171-50/+31
* Use docker-java for image pull and getting container statistics now that we a...valerijf2016-10-173-120/+38
* Merge pull request #862 from yahoo/dybdahl/docker-network-on-macHaakon Dybdahl2016-10-175-57/+165
|\
| * Fix comment.Haakon Dybdahl2016-10-171-1/+1
| * merge masterHaakon Dybdahl2016-10-174-88/+55
| |\
| * | Create a network test for Mac.Haakon Dybdahl2016-10-135-49/+163
* | | Revert "Use HostName for message bus, but fix HostName to work with dev machi...Eirik Nygaard2016-10-141-2/+2
* | | Merge pull request #866 from yahoo/hakon/16Jon Bratseth2016-10-131-2/+2
|\ \ \
| * | | Rename getLocalhost to getHostNameHåkon Hallingstad2016-10-131-2/+2
| | |/ | |/|
* / | Fix for the ConcurrentModificationExceptionvalerijf2016-10-131-1/+1
|/ /
* | Merge pull request #855 from yahoo/freva/DockerTest-linux-fix-with-networkHaakon Dybdahl2016-10-134-90/+63
|\ \ | |/ |/|
| * Added support for Linux and fixed network testvalerijf2016-10-121-75/+48
| * Minor cleanup and enabled simple server image to listen to ipv4valerijf2016-10-123-15/+15
* | Unset metrics via Iterator to avoid concurrent modificationvalerijf2016-10-121-3/+3
|/
* Code review fixes.Haakon Dybdahl2016-10-111-2/+2
* More fixes.Haakon Dybdahl2016-10-112-3/+1
* Nicify constructor.Haakon Dybdahl2016-10-111-38/+31
* More cleanups.Haakon Dybdahl2016-10-111-10/+6
* Clean up a bit.Haakon Dybdahl2016-10-111-20/+1
* Add tests for mac.Haakon Dybdahl2016-10-112-61/+193
* Code review improvementsvalerijf2016-10-071-2/+4
* Code review improvementsvalerijf2016-10-063-22/+42
* Fixed bug where Dimentions.Builder could continue editing the UnmodifiableMap...valerijf2016-10-061-5/+8
* Added MetricReceiverWrapper testsvalerijf2016-10-062-6/+43
* Changed MetricReceiverWrapper to use Dimensions class instead of Mapvalerijf2016-10-063-15/+62
* Rewritten MetricReceiverWrapper to allow setting dimensionsvalerijf2016-10-062-15/+67
* Added test for relevant docker metrics retreivervalerijf2016-10-061-2/+2
* Code review fixesvalerijf2016-10-062-2/+6
* Added method to get docker stats from DockerImplvalerijf2016-10-064-1/+102
* Changed MetricReceiverWrapper API to return map of latest metricsvalerijf2016-10-032-8/+53
* Initialize number of running containers metricvalerijf2016-09-291-0/+3
* Fixed synchronization and added copyrightvalerijf2016-09-295-8/+19
* Added NullGauge in metrics.simple to avoid having to re-create null implement...valerijf2016-09-294-55/+2
* Added intent and synchronized counter + gaugevalerijf2016-09-293-7/+26
* Renamed metricsvalerijf2016-09-291-2/+2
* Added number of active containers and containers downloading an image metricvalerijf2016-09-291-2/+2
* Added null implementations for metric wrappersvalerijf2016-09-293-1/+53
* Added counters for number of running containers and number of fails towards d...valerijf2016-09-292-22/+47
* Added basic Metric keeping classesvalerijf2016-09-296-23/+106
* Added DockerMetricsvalerijf2016-09-293-2/+29
* Remove applicationmodel, part 1Harald Musum2016-09-256-25/+12
* Added method to copy files to a docker containervalerijf2016-09-202-0/+8
* Merge pull request #650 from yahoo/freva/docker-network-setup-exception-printingHaakon Dybdahl2016-09-151-1/+1
|\
| * Include docker exception with RuntimeExceptionvalerijf2016-09-151-2/+2
* | Add exceptionHarald Musum2016-09-151-1/+1
* | Merge branch 'master' into hmusum/pull-image-through-command-line-toolHarald Musum2016-09-145-52/+155
|\|
| * Merge pull request #644 from yahoo/freva/docker-ipv6-network-setupfreva2016-09-145-52/+156
| |\
| | * Code review fixesvalerijf2016-09-141-1/+1