summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove Scala ServiceMonitorHåkon Hallingstad2017-10-2010-722/+2
* Merge pull request #3819 from vespa-engine/freva/use-unique-provision-id-lockValerij Fredriksen2017-10-191-1/+2
|\
| * Fix provision id lockValerij Fredriksen2017-10-191-1/+2
|/
* Merge pull request #3818 from vespa-engine/revert-3615-hakon/provide-service-...Håkon Hallingstad2017-10-194-21/+3
|\
| * Revert "Provide service-monitor and application-model"Håkon Hallingstad2017-10-194-21/+3
|/
* Merge pull request #3816 from vespa-engine/bjorncs/travisArnstein Ressem2017-10-197-58/+9
|\
| * Do full build for both master branch and PRsBjørn Christian Seime2017-10-197-56/+9
| * Ensure all jobs share same cacheBjørn Christian Seime2017-10-191-5/+3
|/
* Merge pull request #3615 from vespa-engine/hakon/provide-service-monitor-and-...Håkon Hallingstad2017-10-194-3/+21
|\
| * Provide service-monitor and application-modelHåkon Hallingstad2017-10-024-3/+21
* | Merge pull request #3814 from vespa-engine/hmusum/use-share-dir-for-configdef...Arnstein Ressem2017-10-199-33/+35
|\ \
| * | Use config definitions from a configured directoryHarald Musum2017-10-189-33/+35
* | | Merge pull request #3815 from vespa-engine/geirst/do-not-require-fields-in-fi...Henning Baldersheim2017-10-182-22/+19
|\ \ \
| * | | Do not require that fields in a field set must be part of the document type.Geir Storli2017-10-182-22/+19
| |/ /
* | | Merge pull request #3796 from vespa-engine/jvenstad/catch-metrics-fetching-er...Jon Marius Venstad2017-10-181-10/+13
|\ \ \ | |/ / |/| |
| * | As requested.Jon Marius Venstad2017-10-181-2/+2
| * | Cleaner codeJon Marius Venstad2017-10-171-10/+13
* | | Merge pull request #3788 from vespa-engine/bratseth/dont-remove-recall-neutra...Jon Bratseth2017-10-1810-99/+131
|\ \ \
| * | | Remove unranked items not contributing to recallJon Bratseth2017-10-182-3/+26
| * | | Nonfunctional changes onlyJon Bratseth2017-10-183-3/+16
| * | | Merge with masterJon Bratseth2017-10-1773-1895/+385
| |\ \ \
| * | | | Don't remove OR terms which contributes to rankJon Bratseth2017-10-174-56/+51
| * | | | Change method order - no functiona changesJon Bratseth2017-10-171-49/+50
| * | | | Remove temporary lineJon Bratseth2017-10-171-1/+0
| * | | | Nonfunctional changes onlyJon Bratseth2017-10-174-4/+8
* | | | | Merge pull request #3809 from vespa-engine/kkraune/ipv4-retire-ap-northeast-2Valerij Fredriksen2017-10-181-0/+2
|\ \ \ \ \
| * | | | | retire ap-northeast-2 ipv4Kristian Aune2017-10-181-0/+2
* | | | | | Merge pull request #3805 from vespa-engine/smorgrav/cost_npeTorbjørn Smørgrav2017-10-182-2/+12
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into smorgrav/cost_npetoby2017-10-1856-1309/+278
| |\ \ \ \ \ \
| * | | | | | | Avoid NPE when cluster utilizations are updated but not cluster infotoby2017-10-182-2/+12
* | | | | | | | Merge pull request #3813 from vespa-engine/bjorncs/travisBjørn Christian Seime2017-10-181-2/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Configure ccache through cli interfaceBjørn Christian Seime2017-10-181-2/+2
* | | | | | | | Merge pull request #3812 from vespa-engine/bratseth/catch-missing-zoneTorbjørn Smørgrav2017-10-181-5/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Catch more errors and warnJon Bratseth2017-10-181-5/+9
* | | | | | | | Merge pull request #3811 from vespa-engine/gjoranv/package-or-namespaceBjørn Christian Seime2017-10-181-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Update error message for bundled defs without package or namespacegjoranv2017-10-181-1/+1
| |/ / / / / / /
* | | | | | | | Merge pull request #3810 from vespa-engine/bjorncs/warn-on-deprecated-principalBjørn Christian Seime2017-10-182-1/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Warn when using deprecated authorization validationBjørn Christian Seime2017-10-182-1/+3
* | | | | | | | Merge pull request #3806 from vespa-engine/hmusum/do-not-log-when-application...Harald Musum2017-10-181-3/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Do not log when application got redeployedHarald Musum2017-10-181-3/+6
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #3802 from vespa-engine/balder/wire-in-a-destructor-callba...Henning Baldersheim2017-10-1820-114/+149
|\ \ \ \ \ \ \
| * | | | | | | Here we can not move the token. We need it ourselves.Henning Baldersheim2017-10-181-4/+4
| * | | | | | | Use make_shared/make_uniqueHenning Baldersheim2017-10-181-16/+18
| * | | | | | | Use the existing sync method.Henning Baldersheim2017-10-181-3/+1
| * | | | | | | Introduce async write interface in the TLS.Henning Baldersheim2017-10-1820-99/+134
* | | | | | | | Merge pull request #3803 from vespa-engine/bjorncs/athenzgjoranv2017-10-187-33/+33
|\ \ \ \ \ \ \ \
| * | | | | | | | Rename Athens->AthenzBjørn Christian Seime2017-10-187-33/+33
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #3782 from vespa-engine/balder/remove-searchxxxpolicyHenning Baldersheim2017-10-1824-1113/+73
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Merge branch 'master' into balder/remove-searchxxxpolicyHenning Baldersheim2017-10-176-12/+8
| |\ \ \ \ \ \ \
| * | | | | | | | No more SERVICE_OOSHenning Baldersheim2017-10-171-1/+0