summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [6.149.44-1].vespa-6.149.44-1by-screwdriver2017-09-274-1/+2
* Merge pull request #3536 from vespa-engine/freva/use-string-as-lock-keyValerij Fredriksen2017-09-261-5/+5
|\
| * Use String as lock keyValerij Fredriksen2017-09-261-5/+5
* | Merge pull request #3535 from vespa-engine/johans1-mentionstackoverflowKristian Aune2017-09-261-0/+3
|\ \
| * | Update CONTRIBUTING.mdKim Omar Johansen2017-09-261-0/+3
* | | Merge pull request #3533 from vespa-engine/gjoranv/dont-enforce-deps-on-old-m...Bjørn Christian Seime2017-09-261-98/+103
|\ \ \ | |/ / |/| |
| * | Do not enforce container deps on maven 3.0.5gjoranv2017-09-251-98/+103
* | | Merge pull request #3517 from vespa-engine/mpolden/deployment-spec-block-upgradeMartin Polden2017-09-266-8/+360
|\ \ \
| * | | Update schemaMartin Polden2017-09-252-0/+9
| * | | Read block-upgrade tag from deployment specMartin Polden2017-09-254-8/+351
* | | | Merge pull request #3534 from vespa-engine/hmusum/check-for-new-or-removed-se...Harald Musum2017-09-261-2/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | Check for sessions changed after reconnectingHarald Musum2017-09-261-2/+4
|/ / /
* | | Merge pull request #3531 from vespa-engine/gjoranv/typoJon Bratseth2017-09-251-1/+1
|\ \ \
| * | | No 'of' needed.gjoranv2017-09-251-1/+1
| * | | might -> maygjoranv2017-09-251-1/+1
| * | | Fix typo.gjoranv2017-09-251-1/+1
| | |/ | |/|
* | | Merge pull request #3532 from vespa-engine/toregge/eliminate-inlining-warningsHenning Baldersheim2017-09-251-43/+1
|\ \ \
| * | | Eliminate inlining warnings.Tor Egge2017-09-251-43/+1
* | | | Merge pull request #3527 from vespa-engine/havardpe/use-internal-match-data-f...Henning Baldersheim2017-09-259-32/+77
|\ \ \ \
| * | | | use internal match data for common dummy term field match dataHåvard Pettersen2017-09-259-32/+77
* | | | | Merge pull request #3515 from vespa-engine/freva/node-admin-lockValerij Fredriksen2017-09-2514-144/+185
|\ \ \ \ \
| * | | | | Noop change to retrigger travisValerij Fredriksen2017-09-251-1/+1
| * | | | | Move ifValerij Fredriksen2017-09-251-3/+3
| * | | | | Use own monitorValerij Fredriksen2017-09-252-21/+31
| * | | | | Rename to lockWhile, rename argumentsValerij Fredriksen2017-09-252-9/+9
| * | | | | Make classLock an OptionalValerij Fredriksen2017-09-251-6/+8
| * | | | | Move log back to NASUValerij Fredriksen2017-09-252-11/+10
| * | | | | Supply ClassLocking to NASUValerij Fredriksen2017-09-254-5/+9
| * | | | | Acquire lock before starting schedulers and threadsValerij Fredriksen2017-09-251-17/+35
| * | | | | Create Thread in constructor to avoid NPEValerij Fredriksen2017-09-251-9/+6
| * | | | | Add tryLock()Valerij Fredriksen2017-09-252-19/+31
| * | | | | Start NodeAdmin schedulers in start()Valerij Fredriksen2017-09-253-12/+23
| * | | | | Rename to NodeAdminProviderValerij Fredriksen2017-09-255-91/+79
* | | | | | Merge pull request #3530 from vespa-engine/revert-3497-mpolden/remove-self-tr...Martin Polden2017-09-2514-81/+142
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Revert "Remove self-triggering support"Harald Musum2017-09-2514-81/+142
|/ / / / /
* | | | | Merge pull request #3522 from vespa-engine/hmusum/avoid-warnings-too-early-ta...gjoranv2017-09-251-11/+15
|\ \ \ \ \
| * | | | | Avoid printing warnings before delay between warnings has passedHarald Musum2017-09-251-11/+15
* | | | | | Merge pull request #3529 from vespa-engine/bjorncs/revert-maven-33Bjørn Christian Seime2017-09-252-6/+2
|\ \ \ \ \ \
| * | | | | | Revert "Maven 3.3.9 or later is required for container-deps-enforcer."Bjørn Christian Seime2017-09-251-1/+1
| * | | | | | Revert "Use Maven 3.3"Bjørn Christian Seime2017-09-251-2/+1
| * | | | | | Revert "Re-port to Fedora after maven requirement changes."Bjørn Christian Seime2017-09-251-4/+1
|/ / / / / /
* | | | | | Merge pull request #3528 from vespa-engine/gjoranv/allow-deps-for-maven3.0Bjørn Christian Seime2017-09-251-0/+8
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Temporarily allow deps that are resolved differently by maven 3.0.gjoranv2017-09-251-0/+8
|/ / / / /
* | | | | Merge pull request #3526 from vespa-engine/toregge/restore-fedora-port-after-...Bjørn Christian Seime2017-09-251-1/+4
|\ \ \ \ \
| * | | | | Re-port to Fedora after maven requirement changes.Tor Egge2017-09-251-1/+4
|/ / / / /
* | | | | Merge pull request #3524 from vespa-engine/bjorncs/use-maven-33gjoranv2017-09-251-1/+2
|\ \ \ \ \
| * | | | | Use Maven 3.3Bjørn Christian Seime2017-09-251-1/+2
* | | | | | Merge pull request #3523 from vespa-engine/gjoranv/maven-versionBjørn Christian Seime2017-09-251-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Maven 3.3.9 or later is required for container-deps-enforcer.gjoranv2017-09-251-1/+1
|/ / / / /
* | | | | Merge pull request #3521 from vespa-engine/balder/90-pecent-not-factor-90Henning Baldersheim2017-09-251-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |