summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add environment info to debug logging at start of runJon Marius Venstad2019-08-191-3/+10
* Merge pull request #10313 from vespa-engine/balder/remove-doc-ids-part-3Henning Baldersheim2019-08-1945-613/+502
|\
| * Update test with enough significant bits.Henning Baldersheim2019-08-191-1/+1
| * Not completely removed yet...Henning Baldersheim2019-08-191-0/+5
| * Remove DocIdString outside of documentHenning Baldersheim2019-08-199-168/+98
| * doc: -> id:Henning Baldersheim2019-08-1637-450/+404
* | Merge pull request #10316 from vespa-engine/olaa/metering-apiOla Aunrønning2019-08-1915-92/+174
|\ \
| * | Addressed commentsOla Aunrønning2019-08-192-2/+2
| * | Merge branch 'master' into olaa/metering-apiOla Aunrønning2019-08-19267-3369/+2105
| |\ \
| * | | Implement metering apiOla Aunrønning2019-08-1915-92/+174
* | | | Merge pull request #10320 from vespa-engine/mpolden/deactivate-surplus-lbsMartin Polden2019-08-194-41/+89
|\ \ \ \
| * | | | Deactivate surplus load balancersMartin Polden2019-08-194-41/+89
* | | | | Merge pull request #10261 from vespa-engine/vekterli/set-status-page-basic-ht...Tor Brede Vekterli2019-08-194-0/+51
|\ \ \ \ \
| * | | | | Set basic HTTP security headers on status pages served from backendTor Brede Vekterli2019-08-134-0/+51
* | | | | | Merge pull request #10321 from vespa-engine/toregge/add-missing-includes-for-...Geir Storli2019-08-191-0/+1
|\ \ \ \ \ \
| * | | | | | Add missing include statement.Tor Egge2019-08-191-0/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #10265 from vespa-engine/hmusum/cleanup-namespace-handling...gjoranv2019-08-1910-53/+30
|\ \ \ \ \ \
| * | | | | | Remove unintended commitHarald Musum2019-08-141-121/+0
| * | | | | | Cleanup of config definition name and namespaceHarald Musum2019-08-149-41/+144
| * | | | | | Require name and namespace to exist and not be emptyHarald Musum2019-08-132-12/+7
* | | | | | | Merge pull request #10317 from vespa-engine/hmusum/get-tenant-repo-from-appli...Jon Marius Venstad2019-08-1914-55/+28
|\ \ \ \ \ \ \
| * | | | | | | Remove unnecessary codeHarald Musum2019-08-191-2/+0
| * | | | | | | Remove unused methodHarald Musum2019-08-191-21/+7
| * | | | | | | Get tenant repo from application repoHarald Musum2019-08-1912-32/+21
* | | | | | | | Merge pull request #10311 from vespa-engine/geirst/attribute-enumerated-save-...Tor Egge2019-08-1910-182/+106
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove "enable enumerated save" flag from attribute vectors as this should be...Geir Storli2019-08-1910-182/+106
* | | | | | | | | Merge pull request #10318 from vespa-engine/jvenstad/absolute-mvn-path-under-...Jon Marius Venstad2019-08-191-1/+6
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Print debug info and use absolute path in public image for nowJon Marius Venstad2019-08-191-1/+6
|/ / / / / / / /
* | | | | | | | Merge pull request #10314 from vespa-engine/toregge/add-missing-return-in-buf...Geir Storli2019-08-191-0/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Add missing return statement.Tor Egge2019-08-181-0/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #9981 from vespa-engine/hmusum/check-config-convergence-fo...Jon Bratseth2019-08-191-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Check cluster controller for config convergenceHarald Musum2019-07-081-0/+2
* | | | | | | Merge pull request #10309 from vespa-engine/balder/remove-some-more-doc-idsHenning Baldersheim2019-08-1618-123/+128
|\ \ \ \ \ \ \
| * | | | | | | doc: -> id:Henning Baldersheim2019-08-163-13/+13
| * | | | | | | doc: -> id:Henning Baldersheim2019-08-1616-111/+116
|/ / / / / / /
* | | | | | | Merge pull request #10307 from vespa-engine/hmusum/cleanup-zk-applicationValerij Fredriksen2019-08-167-164/+69
|\ \ \ \ \ \ \
| * | | | | | | Remove unused methodsHarald Musum2019-08-161-25/+4
| * | | | | | | Rename classHarald Musum2019-08-164-54/+45
| * | | | | | | CleanupHarald Musum2019-08-166-88/+23
* | | | | | | | Merge pull request #10306 from vespa-engine/balder/remove-docidstring-from-te...Henning Baldersheim2019-08-1654-262/+301
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Update routing config instead of expected result.Henning Baldersheim2019-08-161-2/+2
| * | | | | | | Update routing config instead of expected result.Henning Baldersheim2019-08-161-2/+2
| * | | | | | | No keys...Henning Baldersheim2019-08-161-2/+2
| * | | | | | | Update testsHenning Baldersheim2019-08-161-3/+3
| * | | | | | | Update tests since id: locks document type.Henning Baldersheim2019-08-161-4/+4
| * | | | | | | Update java expected files.Henning Baldersheim2019-08-166-4/+4
| * | | | | | | Update expected lengthHenning Baldersheim2019-08-167-43/+43
| * | | | | | | doc: -> id:Henning Baldersheim2019-08-164-38/+38
| * | | | | | | doc: -> id:Henning Baldersheim2019-08-161-9/+9
| * | | | | | | doc: -> id:Henning Baldersheim2019-08-1614-32/+32