Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Automatic commit of package [vespa] release [6.149.44-1].vespa-6.149.44-1 | by-screwdriver | 2017-09-27 | 4 | -1/+2 |
* | Merge pull request #3536 from vespa-engine/freva/use-string-as-lock-key | Valerij Fredriksen | 2017-09-26 | 1 | -5/+5 |
|\ | |||||
| * | Use String as lock key | Valerij Fredriksen | 2017-09-26 | 1 | -5/+5 |
* | | Merge pull request #3535 from vespa-engine/johans1-mentionstackoverflow | Kristian Aune | 2017-09-26 | 1 | -0/+3 |
|\ \ | |||||
| * | | Update CONTRIBUTING.md | Kim Omar Johansen | 2017-09-26 | 1 | -0/+3 |
* | | | Merge pull request #3533 from vespa-engine/gjoranv/dont-enforce-deps-on-old-m... | Bjørn Christian Seime | 2017-09-26 | 1 | -98/+103 |
|\ \ \ | |/ / |/| | | |||||
| * | | Do not enforce container deps on maven 3.0.5 | gjoranv | 2017-09-25 | 1 | -98/+103 |
* | | | Merge pull request #3517 from vespa-engine/mpolden/deployment-spec-block-upgrade | Martin Polden | 2017-09-26 | 6 | -8/+360 |
|\ \ \ | |||||
| * | | | Update schema | Martin Polden | 2017-09-25 | 2 | -0/+9 |
| * | | | Read block-upgrade tag from deployment spec | Martin Polden | 2017-09-25 | 4 | -8/+351 |
* | | | | Merge pull request #3534 from vespa-engine/hmusum/check-for-new-or-removed-se... | Harald Musum | 2017-09-26 | 1 | -2/+4 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Check for sessions changed after reconnecting | Harald Musum | 2017-09-26 | 1 | -2/+4 |
|/ / / | |||||
* | | | Merge pull request #3531 from vespa-engine/gjoranv/typo | Jon Bratseth | 2017-09-25 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | No 'of' needed. | gjoranv | 2017-09-25 | 1 | -1/+1 |
| * | | | might -> may | gjoranv | 2017-09-25 | 1 | -1/+1 |
| * | | | Fix typo. | gjoranv | 2017-09-25 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge pull request #3532 from vespa-engine/toregge/eliminate-inlining-warnings | Henning Baldersheim | 2017-09-25 | 1 | -43/+1 |
|\ \ \ | |||||
| * | | | Eliminate inlining warnings. | Tor Egge | 2017-09-25 | 1 | -43/+1 |
* | | | | Merge pull request #3527 from vespa-engine/havardpe/use-internal-match-data-f... | Henning Baldersheim | 2017-09-25 | 9 | -32/+77 |
|\ \ \ \ | |||||
| * | | | | use internal match data for common dummy term field match data | Håvard Pettersen | 2017-09-25 | 9 | -32/+77 |
* | | | | | Merge pull request #3515 from vespa-engine/freva/node-admin-lock | Valerij Fredriksen | 2017-09-25 | 14 | -144/+185 |
|\ \ \ \ \ | |||||
| * | | | | | Noop change to retrigger travis | Valerij Fredriksen | 2017-09-25 | 1 | -1/+1 |
| * | | | | | Move if | Valerij Fredriksen | 2017-09-25 | 1 | -3/+3 |
| * | | | | | Use own monitor | Valerij Fredriksen | 2017-09-25 | 2 | -21/+31 |
| * | | | | | Rename to lockWhile, rename arguments | Valerij Fredriksen | 2017-09-25 | 2 | -9/+9 |
| * | | | | | Make classLock an Optional | Valerij Fredriksen | 2017-09-25 | 1 | -6/+8 |
| * | | | | | Move log back to NASU | Valerij Fredriksen | 2017-09-25 | 2 | -11/+10 |
| * | | | | | Supply ClassLocking to NASU | Valerij Fredriksen | 2017-09-25 | 4 | -5/+9 |
| * | | | | | Acquire lock before starting schedulers and threads | Valerij Fredriksen | 2017-09-25 | 1 | -17/+35 |
| * | | | | | Create Thread in constructor to avoid NPE | Valerij Fredriksen | 2017-09-25 | 1 | -9/+6 |
| * | | | | | Add tryLock() | Valerij Fredriksen | 2017-09-25 | 2 | -19/+31 |
| * | | | | | Start NodeAdmin schedulers in start() | Valerij Fredriksen | 2017-09-25 | 3 | -12/+23 |
| * | | | | | Rename to NodeAdminProvider | Valerij Fredriksen | 2017-09-25 | 5 | -91/+79 |
* | | | | | | Merge pull request #3530 from vespa-engine/revert-3497-mpolden/remove-self-tr... | Martin Polden | 2017-09-25 | 14 | -81/+142 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Revert "Remove self-triggering support" | Harald Musum | 2017-09-25 | 14 | -81/+142 |
|/ / / / / | |||||
* | | | | | Merge pull request #3522 from vespa-engine/hmusum/avoid-warnings-too-early-ta... | gjoranv | 2017-09-25 | 1 | -11/+15 |
|\ \ \ \ \ | |||||
| * | | | | | Avoid printing warnings before delay between warnings has passed | Harald Musum | 2017-09-25 | 1 | -11/+15 |
* | | | | | | Merge pull request #3529 from vespa-engine/bjorncs/revert-maven-33 | Bjørn Christian Seime | 2017-09-25 | 2 | -6/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Revert "Maven 3.3.9 or later is required for container-deps-enforcer." | Bjørn Christian Seime | 2017-09-25 | 1 | -1/+1 |
| * | | | | | | Revert "Use Maven 3.3" | Bjørn Christian Seime | 2017-09-25 | 1 | -2/+1 |
| * | | | | | | Revert "Re-port to Fedora after maven requirement changes." | Bjørn Christian Seime | 2017-09-25 | 1 | -4/+1 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #3528 from vespa-engine/gjoranv/allow-deps-for-maven3.0 | Bjørn Christian Seime | 2017-09-25 | 1 | -0/+8 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Temporarily allow deps that are resolved differently by maven 3.0. | gjoranv | 2017-09-25 | 1 | -0/+8 |
|/ / / / / | |||||
* | | | | | Merge pull request #3526 from vespa-engine/toregge/restore-fedora-port-after-... | Bjørn Christian Seime | 2017-09-25 | 1 | -1/+4 |
|\ \ \ \ \ | |||||
| * | | | | | Re-port to Fedora after maven requirement changes. | Tor Egge | 2017-09-25 | 1 | -1/+4 |
|/ / / / / | |||||
* | | | | | Merge pull request #3524 from vespa-engine/bjorncs/use-maven-33 | gjoranv | 2017-09-25 | 1 | -1/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Use Maven 3.3 | Bjørn Christian Seime | 2017-09-25 | 1 | -1/+2 |
* | | | | | | Merge pull request #3523 from vespa-engine/gjoranv/maven-version | Bjørn Christian Seime | 2017-09-25 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Maven 3.3.9 or later is required for container-deps-enforcer. | gjoranv | 2017-09-25 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #3521 from vespa-engine/balder/90-pecent-not-factor-90 | Henning Baldersheim | 2017-09-25 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | |