summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3821 from vespa-engine/aressem/copr-requires-github-event...Jon Marius Venstad2017-10-201-0/+1
|\
| * Copr returns 500 if GitHub event type is not set.Arnstein Ressem2017-10-191-0/+1
* | Merge pull request #3827 from vespa-engine/hmusum/remove-rewrite-of-legacy-ap...Jon Bratseth2017-10-201-33/+0
|\ \
| * | Remove rewrite of legacy application idsHarald Musum2017-10-201-33/+0
* | | Merge pull request #3826 from vespa-engine/revert-3818-revert-3615-hakon/prov...Arnstein Ressem2017-10-208-3/+29
|\ \ \
| * | | Include orchestrator and service-model fat jarsHåkon Hallingstad2017-10-194-0/+8
| * | | Revert "Revert "Provide service-monitor and application-model""Håkon Hallingstad2017-10-194-3/+21
| |/ /
* | | Merge pull request #3825 from vespa-engine/bratseth/dont-parallel-triggerMartin Polden2017-10-207-33/+197
|\ \ \ | |/ / |/| |
| * | Disallow parallel triggeringJon Bratseth2017-10-197-33/+197
* | | Merge pull request #3807 from vespa-engine/andreer/fail-divergent-ready-nodesMartin Polden2017-10-196-5/+51
|\ \ \
| * | | actually mutate node repoAndreas Eriksen2017-10-192-4/+4
| * | | actually mutate node repoAndreas Eriksen2017-10-191-1/+2
| * | | test "null" divergence reportsAndreas Eriksen2017-10-191-0/+7
| * | | simplifyAndreas Eriksen2017-10-192-2/+2
| * | | remove quoted nulls from node repoAndreas Eriksen2017-10-183-4/+14
| * | | fail divergent ready nodesAndreas Eriksen2017-10-182-0/+28
* | | | Merge pull request #3824 from vespa-engine/revert-3724-bjorncs/add-back-keyst...Bjørn Christian Seime2017-10-193-57/+0
|\ \ \ \
| * | | | Revert "Add back SslKeyStoreFactoryProvider as a temporary workaround"Bjørn Christian Seime2017-10-193-57/+0
* | | | | Merge pull request #3822 from vespa-engine/bjorncs/athenzBjørn Christian Seime2017-10-199-22/+22
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Rename TenantType.Athens -> TenantType.AthenzBjørn Christian Seime2017-10-199-22/+22
* | | | | Merge pull request #3823 from vespa-engine/revert-3820-aressem/move-config-se...Arnstein Ressem2017-10-192-3/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Revert "Move config server defs and make sure VESPA_USER owns var/."Harald Musum2017-10-192-3/+2
|/ / / /
* | | | Merge pull request #3820 from vespa-engine/aressem/move-config-server-defsHarald Musum2017-10-192-2/+3
|\ \ \ \
| * | | | Move config server defs and make sure VESPA_USER owns var/.Arnstein Ressem2017-10-192-2/+3
| | |_|/ | |/| |
* | | | 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
| | |_|_|_|/ / | |/| | | | |