Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add back copyright header after xml preamble | Harald Musum | 2016-09-12 | 1 | -0/+1 |
| | |||||
* | Remove copyright line, preprocessing fails with it | Harald Musum | 2016-09-12 | 1 | -1/+0 |
| | |||||
* | Add copyright header | Harald Musum | 2016-09-09 | 14 | -0/+14 |
| | |||||
* | Merge pull request #591 from yahoo/hakon/allow-net-script-for-ipv6 | Bjørn Christian Seime | 2016-09-08 | 1 | -7/+14 |
|\ | | | | | Support using network setup script for IPv6 | ||||
| * | Support using network setup script for IPv6 | Håkon Hallingstad | 2016-09-08 | 1 | -7/+14 |
| | | |||||
* | | Clear current docker image in node repo | valerijf | 2016-09-08 | 10 | -68/+88 |
|/ | |||||
* | Merge pull request #586 from yahoo/bjorncs/networking-script-ipv6 | hakonhall | 2016-09-07 | 1 | -14/+15 |
|\ | | | | | Add support for IPv6 | ||||
| * | Add support for IPv6 | Bjørn Christian Seime | 2016-09-07 | 1 | -14/+15 |
| | | |||||
* | | Moved DockerTest resources to docker-api | valerijf | 2016-09-07 | 3 | -59/+0 |
| | | |||||
* | | Merge pull request #576 from yahoo/dybdahl/node-admin-with-working-dependencies | Harald Musum | 2016-09-07 | 1 | -6/+9 |
|\ \ | | | | | | | Move back to working versions of libraries. | ||||
| * | | Move back to working versions of libraries. | Haakon Dybdahl | 2016-09-07 | 1 | -6/+9 |
| | | | |||||
* | | | Merge pull request #578 from ↵ | Haakon Dybdahl | 2016-09-07 | 2 | -2/+6 |
|\ \ \ | | | | | | | | | | | | | | | | | yahoo/hmusum/do-not-patch-node-repo-before-mark-as-ready Temporarily skip updating node repo with current attributes | ||||
| * | | | Temporarily skip updating node repo with current attributes | Harald Musum | 2016-09-07 | 2 | -2/+6 |
| | |/ | |/| | | | | | | | | | | * It's not legal to update with current restart generation unless node is allocated, need to refactor code to make this work again | ||||
* | | | Add vespalog to class path (needed for using LogLevel) | Harald Musum | 2016-09-07 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Merge pull request #573 from ↵ | Haakon Dybdahl | 2016-09-07 | 2 | -7/+11 |
|\ \ | |/ |/| | | | | | yahoo/hmusum/handle-no-restart-generation-when-setting-node-ready Handle no restart generation in node spec | ||||
| * | Handle no restart generation in node spec | Harald Musum | 2016-09-07 | 2 | -7/+11 |
| | | |||||
* | | Merge pull request #572 from yahoo/freva/docker-getUnusedDockerImages-fix | Harald Musum | 2016-09-07 | 3 | -81/+8 |
|\ \ | |/ |/| | Freva/docker get unused docker images fix | ||||
| * | DockerImpl interface now provides deleteUnusedDockerImages instead of get | valerijf | 2016-09-06 | 3 | -81/+8 |
| | | |||||
* | | Merge pull request #558 from yahoo/freva/docker-integration-tests | Harald Musum | 2016-09-07 | 17 | -451/+349 |
|\| | | | | | Freva/docker integration tests | ||||
| * | Fixed all node-admin/integrationTests to work with new docker-api | valerijf | 2016-09-06 | 7 | -276/+166 |
| | | |||||
| * | Rewritten test mocks to use CallOrderVerifier | valerijf | 2016-09-06 | 6 | -144/+148 |
| | | |||||
| * | DockerOperations now takes in Enviroment instance instead of static method ↵ | valerijf | 2016-09-05 | 6 | -32/+36 |
| | | | | | | | | for testing | ||||
* | | Include docker-api to maintenance classpath | valerijf | 2016-09-07 | 1 | -1/+1 |
| | | |||||
* | | Minor refactoring | Harald Musum | 2016-09-06 | 1 | -9/+14 |
| | | |||||
* | | Make sure to clear current docker image and vespa version when cleaning node | Harald Musum | 2016-09-06 | 2 | -11/+19 |
|/ | |||||
* | Merge pull request #536 from yahoo/hakon/docker-api-bundle | hakonhall | 2016-09-05 | 42 | -2617/+451 |
|\ | | | | | Use docker-api bundle | ||||
| * | Apply PR 527 to DockerOperationsImpl | Håkon Hallingstad | 2016-09-05 | 1 | -1/+1 |
| | | |||||
| * | Correct config name in services.xml | Håkon Hallingstad | 2016-09-02 | 1 | -1/+1 |
| | | |||||
| * | Fix config namespace in services.xml | Håkon Hallingstad | 2016-09-02 | 1 | -1/+1 |
| | | |||||
| * | Fix tests in NodeAgentImplTest | Håkon Hallingstad | 2016-09-02 | 3 | -819/+71 |
| | | |||||
| * | Ignore all tests in node-admin that fail | Håkon Hallingstad | 2016-09-01 | 5 | -6/+39 |
| | | |||||
| * | Make node-admin use docker-api bundle | Håkon Hallingstad | 2016-09-01 | 12 | -63/+66 |
| | | |||||
| * | Need to figure out what to do with the tests using DockerOperations | Håkon Hallingstad | 2016-09-01 | 42 | -1870/+416 |
| | | |||||
* | | Use logger instead of printing to stderr | Harald Musum | 2016-09-05 | 1 | -5/+9 |
| | | |||||
* | | Add /var/run to mounted dirs | Harald Musum | 2016-09-01 | 1 | -1/+1 |
|/ | |||||
* | Extended DockerTest doc | valerijf | 2016-08-30 | 1 | -1/+7 |
| | |||||
* | Set default host protocol from HTTPS to TCP, this was previously manually ↵ | valerijf | 2016-08-30 | 1 | -1/+1 |
| | | | | overwritten by DockerImpl | ||||
* | Set Docker factory before running info call, set host from DockerConfig | valerijf | 2016-08-30 | 1 | -14/+10 |
| | |||||
* | DockerTest now uses locally built image | valerijf | 2016-08-30 | 1 | -1/+0 |
| | |||||
* | Un-ignored an unintentionally ignored a test | valerijf | 2016-08-30 | 1 | -1/+0 |
| | |||||
* | Merge conflict | valerijf | 2016-08-30 | 1 | -0/+1 |
| | |||||
* | Merge conflict | valerijf | 2016-08-30 | 1 | -3/+0 |
| | |||||
* | Removed a pull image test as this functionality is now covered by docker | valerijf | 2016-08-30 | 1 | -0/+4 |
| | | | | | Conflicts: node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/DockerImplTest.java | ||||
* | DockerTest now uses locally built image | valerijf | 2016-08-30 | 1 | -16/+27 |
| | |||||
* | Added simple-ipv6-server docker image source | valerijf | 2016-08-30 | 3 | -0/+59 |
| | |||||
* | Un-ignored an unintentionally ignored a test | valerijf | 2016-08-30 | 1 | -2/+0 |
| | |||||
* | Created tests to test docker-client library and docker itself locally | valerijf | 2016-08-30 | 2 | -2/+161 |
| | |||||
* | Added field to store stderr separately in ProcessResult | valerijf | 2016-08-30 | 5 | -24/+27 |
| | |||||
* | startContainer now takes in InetAddress | valerijf | 2016-08-30 | 9 | -68/+94 |
| | |||||
* | Removed a pull image test as this functionality is now covered by docker | valerijf | 2016-08-30 | 1 | -33/+0 |
| |