summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add back need field for JNIHarald Musum2016-09-071-0/+3
* Merge pull request #586 from yahoo/bjorncs/networking-script-ipv6hakonhall2016-09-071-14/+15
|\
| * Add support for IPv6Bjørn Christian Seime2016-09-071-14/+15
* | Merge pull request #574 from yahoo/bratseth/protect-zk-access-part-2Jon Bratseth2016-09-0712-71/+210
|\ \
| * | Assert on tenant node countJon Bratseth2016-09-071-0/+3
| * | Correct typoJon Bratseth2016-09-071-1/+1
| * | Deactivate until proxy nodes are addedJon Bratseth2016-09-071-2/+3
| * | Reduce log levelsJon Bratseth2016-09-071-4/+4
| * | Maintain zk access across nodes and support proxiesJon Bratseth2016-09-0711-66/+201
* | | Merge pull request #583 from yahoo/freva/node-admin-repoTags-nullHaakon Dybdahl2016-09-071-2/+24
|\ \ \
| * | | Fix for NullPointerException with repoTagsvalerijf2016-09-071-2/+24
|/ / /
* | | Merge pull request #582 from yahoo/freva/docker-test-resourcesHarald Musum2016-09-073-0/+0
|\ \ \
| * | | Moved DockerTest resources to docker-apivalerijf2016-09-073-0/+0
* | | | Merge pull request #580 from yahoo/havardpe/tensors-without-dimensions-are-do...Geir Storli2016-09-079-54/+51
|\ \ \ \ | |/ / / |/| | |
| * | | tensors without dimensions are numbersHaavard2016-09-072-3/+3
| * | | better handling of empty tensorsHaavard2016-09-077-51/+48
* | | | Merge pull request #576 from yahoo/dybdahl/node-admin-with-working-dependenciesHarald Musum2016-09-072-13/+86
|\ \ \ \
| * | | | Move back to working versions of libraries.Haakon Dybdahl2016-09-072-13/+86
* | | | | Merge pull request #577 from yahoo/arnej/provide-ranking-constants-config-to-...gjoranv2016-09-071-11/+17
|\ \ \ \ \
| * | | | | style fixArne H Juul2016-09-071-14/+14
| * | | | | provide new config to verify_ranksetupArne H Juul2016-09-071-0/+6
| | |_|/ / | |/| | |
* | | | | Merge pull request #578 from yahoo/hmusum/do-not-patch-node-repo-before-mark-...Haakon Dybdahl2016-09-072-2/+6
|\ \ \ \ \
| * | | | | Temporarily skip updating node repo with current attributesHarald Musum2016-09-072-2/+6
| | |_|_|/ | |/| | |
* | | | | Merge pull request #579 from yahoo/hmusum/add-vespalog-to-class-pathfreva2016-09-071-1/+1
|\ \ \ \ \
| * | | | | Add vespalog to class path (needed for using LogLevel)Harald Musum2016-09-071-1/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #575 from yahoo/freva/docker-api-DockerConfigHarald Musum2016-09-073-7/+85
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Added tests for docker config buildervalerijf2016-09-071-0/+61
| * | | | Added function to read DockerConfig and enable TLS if neededvalerijf2016-09-072-7/+24
| |/ / /
* | | | Merge pull request #573 from yahoo/hmusum/handle-no-restart-generation-when-s...Haakon Dybdahl2016-09-072-7/+11
|\ \ \ \ | |/ / / |/| | |
| * | | Handle no restart generation in node specHarald Musum2016-09-072-7/+11
* | | | Merge pull request #572 from yahoo/freva/docker-getUnusedDockerImages-fixHarald Musum2016-09-077-201/+149
|\ \ \ \ | |/ / / |/| | |
| * | | Simplified Compareablevalerijf2016-09-061-5/+3
| * | | DockerImpl interface now provides deleteUnusedDockerImages instead of getvalerijf2016-09-067-201/+151
* | | | Merge pull request #558 from yahoo/freva/docker-integration-testsHarald Musum2016-09-0719-463/+357
|\| | |
| * | | DockerTest now uses docker-api to create containervalerijf2016-09-062-12/+8
| * | | Fixed all node-admin/integrationTests to work with new docker-apivalerijf2016-09-067-276/+166
| * | | Rewritten test mocks to use CallOrderVerifiervalerijf2016-09-066-144/+148
| * | | DockerOperations now takes in Enviroment instance instead of static method fo...valerijf2016-09-056-32/+36
* | | | Merge pull request #571 from yahoo/freva/include-docker-api-to-maintenance-cl...Harald Musum2016-09-071-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Include docker-api to maintenance classpathvalerijf2016-09-071-1/+1
|/ / /
* | | Merge pull request #569 from yahoo/bratseth/dont-include-spource-filesHarald Musum2016-09-072-4/+10
|\ \ \
| * | | Don't include source files when creating with 'deploy data'Jon Bratseth2016-09-062-4/+10
* | | | Merge pull request #570 from yahoo/musum/clconfigserver-cleanup-part-1Haakon Dybdahl2016-09-0723-84/+22
|\ \ \ \ | |/ / / |/| | |
| * | | Cleanup, no functional changesHarald Musum2016-09-0723-84/+22
|/ / /
* | | Merge pull request #568 from yahoo/balder/breakfix-config-serverHenning Baldersheim2016-09-061-2/+2
|\ \ \
| * | | Blind fix to get factory goingHenning Baldersheim2016-09-061-2/+2
|/ / /
* | | Merge pull request #567 from yahoo/balder/run-valgrind-on-filedistributor-tooEirik Nygaard2016-09-061-5/+0
|\ \ \
| * | | Also verify the most dirty one.Henning Baldersheim2016-09-061-5/+0
|/ / /
* | | Merge pull request #566 from yahoo/balder/remove-volatileHenning Baldersheim2016-09-061-4/+4
|\ \ \
| * | | Remove volatileHenning Baldersheim2016-09-061-4/+4
|/ / /