Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Automatic commit of package [vespa] release [6.148.85-1].vespa-6.148.85-1 | by-screwdriver | 2017-09-25 | 4 | -1/+2 |
* | Merge pull request #3507 from vespa-engine/revert-3464-freva/node-admin-shutdown | Valerij Fredriksen | 2017-09-22 | 29 | -322/+315 |
|\ | |||||
| * | Revert "Freva/node admin shutdown" | Valerij Fredriksen | 2017-09-22 | 29 | -322/+315 |
|/ | |||||
* | Merge pull request #3506 from vespa-engine/revert-3502-freva/node-admin-injec... | Valerij Fredriksen | 2017-09-22 | 1 | -3/+3 |
|\ | |||||
| * | Revert "RestApiHandler injection fix" | Valerij Fredriksen | 2017-09-22 | 1 | -3/+3 |
|/ | |||||
* | Merge pull request #3505 from vespa-engine/revert-3504-freva/disable-node-adm... | Valerij Fredriksen | 2017-09-22 | 1 | -2/+12 |
|\ | |||||
| * | Revert "Remove node-admin locks" | Valerij Fredriksen | 2017-09-22 | 1 | -2/+12 |
|/ | |||||
* | Merge pull request #3504 from vespa-engine/freva/disable-node-admin-locks | Valerij Fredriksen | 2017-09-22 | 1 | -12/+2 |
|\ | |||||
| * | Remove node-admin locks | Valerij Fredriksen | 2017-09-22 | 1 | -12/+2 |
|/ | |||||
* | Merge pull request #3503 from vespa-engine/gjoranv/bouncycastle | Bjørn Christian Seime | 2017-09-22 | 2 | -1/+12 |
|\ | |||||
| * | Provide bouncycastle on test classpath. | gjoranv | 2017-09-22 | 2 | -1/+12 |
|/ | |||||
* | Merge pull request #3502 from vespa-engine/freva/node-admin-injection-fix | hakonhall | 2017-09-22 | 1 | -3/+3 |
|\ | |||||
| * | RestApiHandler injection fix | Valerij Fredriksen | 2017-09-22 | 1 | -3/+3 |
* | | Merge pull request #3501 from vespa-engine/mpolden/always-restart-deadlocked-... | Martin Polden | 2017-09-22 | 2 | -4/+68 |
|\ \ | |||||
| * | | Always restart deadlocked deployment | Martin Polden | 2017-09-22 | 2 | -4/+68 |
| |/ | |||||
* | | Merge pull request #3487 from vespa-engine/ldalves/cost-metrics | Leandro Alves | 2017-09-22 | 2 | -10/+80 |
|\ \ | |||||
| * | | adds cluster cost metrics class | Leandro Alves | 2017-09-21 | 2 | -10/+80 |
* | | | Merge pull request #3426 from vespa-engine/bratseth/nonfunctional-changes-4 | Arne H Juul | 2017-09-22 | 119 | -106/+267 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Merge branch 'master' into bratseth/nonfunctional-changes-4 | Arne Juul | 2017-09-22 | 496 | -4159/+4043 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #3492 from vespa-engine/arnej/improve-pidfile-handling | Tor Egge | 2017-09-22 | 1 | -11/+26 |
|\ \ \ | |||||
| * | | | add robustness | Arne Juul | 2017-09-21 | 1 | -11/+26 |
* | | | | Merge pull request #3500 from vespa-engine/aressem/remove-yahoo-specific-dirs | Arne H Juul | 2017-09-22 | 2 | -2/+0 |
|\ \ \ \ | |||||
| * | | | | Remove yjava and yell directories. | Arnstein Ressem | 2017-09-22 | 2 | -2/+0 |
* | | | | | Merge pull request #3493 from vespa-engine/bratseth/avoid-boolean-search-phrase | Bjørn Christian Seime | 2017-09-22 | 8 | -16/+20 |
|\ \ \ \ \ | |||||
| * | | | | | Avoid the phrase 'boolean search' for predicate fields | Jon Bratseth | 2017-09-21 | 8 | -16/+20 |
* | | | | | | Merge pull request #3464 from vespa-engine/freva/node-admin-shutdown | Valerij Fredriksen | 2017-09-22 | 29 | -315/+322 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge remote-tracking branch 'origin/freva/node-admin-shutdown' into freva/no... | Valerij Fredriksen | 2017-09-22 | 0 | -0/+0 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Surround in try/catch | Valerij Fredriksen | 2017-09-20 | 1 | -26/+31 |
| | * | | | | | | Moved log | Valerij Fredriksen | 2017-09-20 | 2 | -7/+14 |
| | * | | | | | | Use lock instead | Valerij Fredriksen | 2017-09-20 | 1 | -8/+3 |
| | * | | | | | | Renamed ComponentProviderImpl to NodeAdminProvider | Valerij Fredriksen | 2017-09-20 | 5 | -30/+22 |
| | * | | | | | | Start schedulers in start() | Valerij Fredriksen | 2017-09-20 | 2 | -22/+24 |
| | * | | | | | | Add locks to ComponentsProviderImpl | Valerij Fredriksen | 2017-09-20 | 7 | -7/+49 |
| | * | | | | | | ComponentsProviderImpl to implement deconstruct and shut down everything | Valerij Fredriksen | 2017-09-20 | 6 | -42/+45 |
| | * | | | | | | Simplify ComponentsProvider | Valerij Fredriksen | 2017-09-20 | 6 | -84/+49 |
| | * | | | | | | Re-order arguments, take converge interval as Duration instead | Valerij Fredriksen | 2017-09-20 | 3 | -22/+23 |
| | * | | | | | | Take NodeAgent interval in constructor | Valerij Fredriksen | 2017-09-20 | 5 | -21/+20 |
| | * | | | | | | Make Orchestrator constructor same as NodeRepository | Valerij Fredriksen | 2017-09-20 | 2 | -22/+17 |
| | * | | | | | | Simplify NodeRepository constructor | Valerij Fredriksen | 2017-09-20 | 5 | -19/+20 |
| * | | | | | | | Put acquire lock before try block | Valerij Fredriksen | 2017-09-22 | 1 | -3/+3 |
| * | | | | | | | Surround in try/catch | Valerij Fredriksen | 2017-09-22 | 1 | -26/+31 |
| * | | | | | | | Moved log | Valerij Fredriksen | 2017-09-22 | 2 | -7/+14 |
| * | | | | | | | Use lock instead | Valerij Fredriksen | 2017-09-22 | 1 | -8/+3 |
| * | | | | | | | Renamed ComponentProviderImpl to NodeAdminProvider | Valerij Fredriksen | 2017-09-22 | 5 | -30/+22 |
| * | | | | | | | Start schedulers in start() | Valerij Fredriksen | 2017-09-22 | 2 | -22/+24 |
| * | | | | | | | Add locks to ComponentsProviderImpl | Valerij Fredriksen | 2017-09-22 | 7 | -7/+49 |
| * | | | | | | | ComponentsProviderImpl to implement deconstruct and shut down everything | Valerij Fredriksen | 2017-09-22 | 6 | -42/+45 |
| * | | | | | | | Simplify ComponentsProvider | Valerij Fredriksen | 2017-09-22 | 6 | -84/+49 |
| * | | | | | | | Re-order arguments, take converge interval as Duration instead | Valerij Fredriksen | 2017-09-22 | 3 | -22/+23 |
| * | | | | | | | Take NodeAgent interval in constructor | Valerij Fredriksen | 2017-09-22 | 5 | -21/+20 |