summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Always pass wanted Vespa versionJon Bratseth2017-04-1946-181/+266
* Always have wanted node version (WIP)Jon Bratseth2017-04-188-32/+51
* Merge branch 'master' into bratseth/receive-wanted-versionJon Bratseth2017-04-181099-5756/+6349
|\
| * Merge pull request #2190 from yahoo/freva/node-admin_orchestrator_suspendValerij Fredriksen2017-04-186-17/+25
| |\
| | * Only ask Orchestrator for permission to suspend when in state activevalerijf2017-04-182-3/+10
| | * Revert "Treat NOT FOUND from Orchestrator as OK"valerijf2017-04-184-14/+15
| * | Merge pull request #2192 from yahoo/hmusum/config-proxy-refactoringgjoranv2017-04-188-92/+121
| |\ \
| | * | Add commentHarald Musum2017-04-052-1/+2
| | * | Add test for reconfiguration of clientHarald Musum2017-04-051-2/+27
| | * | Testing changes: Rename config source class, add client classHarald Musum2017-04-054-26/+51
| | * | Move statistics testing, remove some duplicate cach testingHarald Musum2017-04-055-66/+44
| * | | Merge pull request #2174 from yahoo/hmusum/remove-searchdefinitions-syntaxgjoranv2017-04-1814-301/+16
| |\ \ \ | | |_|/ | |/| |
| | * | Fix syntaxHarald Musum2017-04-071-5/+4
| | * | Remove unused apps and fix no longer valid <searchdefinitions> in services.xmlHarald Musum2017-04-0614-298/+14
| * | | Merge pull request #2179 from yahoo/bjorncs/use-seconds-for-jetty-timeoutsgjoranv2017-04-184-5/+10
| |\ \ \
| | * | | Change soLingerTime unit from milliseconds to secondsBjørn Christian Seime2017-04-184-5/+10
| * | | | Merge pull request #2189 from yahoo/bjorncs/stabilize-jdisc-testsgjoranv2017-04-181-1/+1
| |\ \ \ \
| | * | | | Allow 200 without contentBjørn Christian Seime2017-04-181-1/+1
| * | | | | Merge pull request #2188 from yahoo/freva/orchestrator-ok-on-not-foundHarald Musum2017-04-184-15/+14
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Treat NOT FOUND from Orchestrator as OKValerij2017-04-134-15/+14
| |/ / / /
| * | | | Merge pull request #2187 from yahoo/arnej/sprinkle-override-6Håvard Pettersen2017-04-12357-1366/+1385
| |\ \ \ \
| | * | | | add override in searchcore moduleArne H Juul2017-04-12164-804/+795
| | * | | | add override in vsm moduleArne H Juul2017-04-1213-24/+24
| | * | | | add override in streamingvisitors moduleArne H Juul2017-04-128-17/+17
| | * | | | add override in storageserver moduleArne H Juul2017-04-127-37/+37
| | * | | | add override in storage moduleArne H Juul2017-04-121-1/+2
| | * | | | add override in searchsummary moduleArne H Juul2017-04-1215-80/+80
| | * | | | add override in searchcorespi moduleArne H Juul2017-04-129-53/+53
| | * | | | add override in searchcommon moduleArne H Juul2017-04-121-1/+1
| | * | | | add override in searchlib moduleArne H Juul2017-04-12134-346/+347
| | * | | | more regular APIsArne H Juul2017-04-124-3/+21
| | * | | | move onAddDoc API up to common base classArne H Juul2017-04-121-0/+8
| |/ / / /
| * | | | Merge pull request #2186 from yahoo/arnej/sprinkle-override-3Håvard Pettersen2017-04-1242-261/+221
| |\ \ \ \
| | * | | | add some override in searchlib moduleArne H Juul2017-04-1142-261/+221
| * | | | | Merge pull request #2184 from yahoo/arnej/sprinkle-override-2Håvard Pettersen2017-04-12161-615/+585
| |\| | | |
| | * | | | add override in storage testsArne H Juul2017-04-1156-136/+136
| | * | | | add override in storage/visiting moduleArne H Juul2017-04-119-46/+41
| | * | | | add override in storage/tools moduleArne H Juul2017-04-112-15/+15
| | * | | | add override in storage/storageserver moduleArne H Juul2017-04-1110-75/+68
| | * | | | add override in storage/persistence moduleArne H Juul2017-04-118-67/+60
| | * | | | add override in storage/frameworkimpl moduleArne H Juul2017-04-117-15/+13
| | * | | | add override in storage/distributor moduleArne H Juul2017-04-1117-103/+101
| | * | | | add override in storage/config moduleArne H Juul2017-04-111-1/+1
| | * | | | add override in storage/common moduleArne H Juul2017-04-116-29/+31
| | * | | | add override in storage/bucketmover moduleArne H Juul2017-04-111-2/+1
| | * | | | add override in storage/bucketdb moduleArne H Juul2017-04-116-28/+21
| | * | | | add override in vespaclient moduleArne H Juul2017-04-116-8/+8
| | * | | | add override in vdstestlib moduleArne H Juul2017-04-111-1/+1
| | * | | | add override in storageapi moduleArne H Juul2017-04-111-2/+2
| | * | | | add override in messagebus_test moduleArne H Juul2017-04-116-11/+11