summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [6.148.85-1].vespa-6.148.85-1by-screwdriver2017-09-254-1/+2
* Merge pull request #3507 from vespa-engine/revert-3464-freva/node-admin-shutdownValerij Fredriksen2017-09-2229-322/+315
|\
| * Revert "Freva/node admin shutdown"Valerij Fredriksen2017-09-2229-322/+315
|/
* Merge pull request #3506 from vespa-engine/revert-3502-freva/node-admin-injec...Valerij Fredriksen2017-09-221-3/+3
|\
| * Revert "RestApiHandler injection fix"Valerij Fredriksen2017-09-221-3/+3
|/
* Merge pull request #3505 from vespa-engine/revert-3504-freva/disable-node-adm...Valerij Fredriksen2017-09-221-2/+12
|\
| * Revert "Remove node-admin locks"Valerij Fredriksen2017-09-221-2/+12
|/
* Merge pull request #3504 from vespa-engine/freva/disable-node-admin-locksValerij Fredriksen2017-09-221-12/+2
|\
| * Remove node-admin locksValerij Fredriksen2017-09-221-12/+2
|/
* Merge pull request #3503 from vespa-engine/gjoranv/bouncycastleBjørn Christian Seime2017-09-222-1/+12
|\
| * Provide bouncycastle on test classpath.gjoranv2017-09-222-1/+12
|/
* Merge pull request #3502 from vespa-engine/freva/node-admin-injection-fixhakonhall2017-09-221-3/+3
|\
| * RestApiHandler injection fixValerij Fredriksen2017-09-221-3/+3
* | Merge pull request #3501 from vespa-engine/mpolden/always-restart-deadlocked-...Martin Polden2017-09-222-4/+68
|\ \
| * | Always restart deadlocked deploymentMartin Polden2017-09-222-4/+68
| |/
* | Merge pull request #3487 from vespa-engine/ldalves/cost-metricsLeandro Alves2017-09-222-10/+80
|\ \
| * | adds cluster cost metrics classLeandro Alves2017-09-212-10/+80
* | | Merge pull request #3426 from vespa-engine/bratseth/nonfunctional-changes-4Arne H Juul2017-09-22119-106/+267
|\ \ \ | |_|/ |/| |
| * | Merge branch 'master' into bratseth/nonfunctional-changes-4Arne Juul2017-09-22496-4159/+4043
| |\ \ | |/ / |/| |
* | | Merge pull request #3492 from vespa-engine/arnej/improve-pidfile-handlingTor Egge2017-09-221-11/+26
|\ \ \
| * | | add robustnessArne Juul2017-09-211-11/+26
* | | | Merge pull request #3500 from vespa-engine/aressem/remove-yahoo-specific-dirsArne H Juul2017-09-222-2/+0
|\ \ \ \
| * | | | Remove yjava and yell directories.Arnstein Ressem2017-09-222-2/+0
* | | | | Merge pull request #3493 from vespa-engine/bratseth/avoid-boolean-search-phraseBjørn Christian Seime2017-09-228-16/+20
|\ \ \ \ \
| * | | | | Avoid the phrase 'boolean search' for predicate fieldsJon Bratseth2017-09-218-16/+20
* | | | | | Merge pull request #3464 from vespa-engine/freva/node-admin-shutdownValerij Fredriksen2017-09-2229-315/+322
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/freva/node-admin-shutdown' into freva/no...Valerij Fredriksen2017-09-220-0/+0
| |\ \ \ \ \ \
| | * | | | | | Surround in try/catchValerij Fredriksen2017-09-201-26/+31
| | * | | | | | Moved logValerij Fredriksen2017-09-202-7/+14
| | * | | | | | Use lock insteadValerij Fredriksen2017-09-201-8/+3
| | * | | | | | Renamed ComponentProviderImpl to NodeAdminProviderValerij Fredriksen2017-09-205-30/+22
| | * | | | | | Start schedulers in start()Valerij Fredriksen2017-09-202-22/+24
| | * | | | | | Add locks to ComponentsProviderImplValerij Fredriksen2017-09-207-7/+49
| | * | | | | | ComponentsProviderImpl to implement deconstruct and shut down everythingValerij Fredriksen2017-09-206-42/+45
| | * | | | | | Simplify ComponentsProviderValerij Fredriksen2017-09-206-84/+49
| | * | | | | | Re-order arguments, take converge interval as Duration insteadValerij Fredriksen2017-09-203-22/+23
| | * | | | | | Take NodeAgent interval in constructorValerij Fredriksen2017-09-205-21/+20
| | * | | | | | Make Orchestrator constructor same as NodeRepositoryValerij Fredriksen2017-09-202-22/+17
| | * | | | | | Simplify NodeRepository constructorValerij Fredriksen2017-09-205-19/+20
| * | | | | | | Put acquire lock before try blockValerij Fredriksen2017-09-221-3/+3
| * | | | | | | Surround in try/catchValerij Fredriksen2017-09-221-26/+31
| * | | | | | | Moved logValerij Fredriksen2017-09-222-7/+14
| * | | | | | | Use lock insteadValerij Fredriksen2017-09-221-8/+3
| * | | | | | | Renamed ComponentProviderImpl to NodeAdminProviderValerij Fredriksen2017-09-225-30/+22
| * | | | | | | Start schedulers in start()Valerij Fredriksen2017-09-222-22/+24
| * | | | | | | Add locks to ComponentsProviderImplValerij Fredriksen2017-09-227-7/+49
| * | | | | | | ComponentsProviderImpl to implement deconstruct and shut down everythingValerij Fredriksen2017-09-226-42/+45
| * | | | | | | Simplify ComponentsProviderValerij Fredriksen2017-09-226-84/+49
| * | | | | | | Re-order arguments, take converge interval as Duration insteadValerij Fredriksen2017-09-223-22/+23
| * | | | | | | Take NodeAgent interval in constructorValerij Fredriksen2017-09-225-21/+20