summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #10262 from vespa-engine/bjorncs/http-bindings-cleanupBjørn Christian Seime2019-08-166-10/+14
|\
| * Fix invalid bindings in ApplicationTestBjørn Christian Seime2019-08-151-2/+2
| * Fix assertionBjørn Christian Seime2019-08-152-5/+9
| * Don't use wildcard scheme in uri patternsBjørn Christian Seime2019-08-134-4/+4
* | Merge pull request #10303 from vespa-engine/toregge/style-fixes-for-unique-st...Geir Storli2019-08-166-22/+19
|\ \
| * | Style fixes for UniqueStoreStringAllocator.Tor Egge2019-08-156-22/+19
* | | Merge pull request #10298 from vespa-engine/mpolden/controller-versionMartin Polden2019-08-1619-163/+273
|\ \ \
| * | | Remove GitHub dependencyMartin Polden2019-08-153-20/+8
| * | | Use commit details from ControllerVersion in VersionStatusMartin Polden2019-08-153-20/+15
| * | | Store version and commit details in ControllerVersionMartin Polden2019-08-1510-61/+194
| * | | Reduce code duplicationMartin Polden2019-08-155-51/+47
| * | | ListMap -> ListMultimapMartin Polden2019-08-151-19/+17
* | | | Merge pull request #10227 from vespa-engine/balder/remove-legacy-docidsHenning Baldersheim2019-08-1512-673/+25
|\ \ \ \
| * | | | Remove legacy orderdoc, groupdoc, userdoc documentidsHenning Baldersheim2019-08-0912-673/+25
* | | | | Merge pull request #10226 from vespa-engine/balder/prepare-remove-visitor-ord...Henning Baldersheim2019-08-1578-1485/+224
|\ \ \ \ \
| * | | | | Follow up from review comments.Henning Baldersheim2019-08-155-23/+2
| * | | | | Merge branch 'master' into balder/prepare-remove-visitor-orderingHenning Baldersheim2019-08-15256-2605/+4034
| |\ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
* | | | | Merge pull request #10299 from vespa-engine/bjorncs/jetty-upgradeHenning Baldersheim2019-08-151-1/+1
|\ \ \ \ \
| * | | | | Upgrade Jetty to 9.4.20Bjørn Christian Seime2019-08-151-1/+1
* | | | | | Merge pull request #10289 from vespa-engine/hmusum/cleanup-tests-2Henning Baldersheim2019-08-1524-167/+164
|\ \ \ \ \ \
| * | | | | | Cleanup of tests, no changesHarald Musum2019-08-1524-167/+164
* | | | | | | Merge pull request #10297 from vespa-engine/balder/some-cleanup-while-reading...Henning Baldersheim2019-08-1510-72/+65
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | std::make_unique while reading up on phrase search code.Henning Baldersheim2019-08-1510-72/+65
* | | | | | | Merge pull request #10301 from vespa-engine/hakonhall/create-vespa-home-direc...Jon Marius Venstad2019-08-151-1/+3
|\ \ \ \ \ \ \
| * | | | | | | Create vespa home directory (/opt/vespa)Håkon Hallingstad2019-08-151-1/+3
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #10291 from vespa-engine/toregge/add-unique-store-string-a...Tor Brede Vekterli2019-08-1521-24/+610
|\ \ \ \ \ \ \
| * | | | | | | Extend class comment for UniqueStoreStringAllocator.Tor Egge2019-08-151-3/+9
| * | | | | | | Add struct BufferStats, used by unit tests.Tor Egge2019-08-152-36/+73
| * | | | | | | Add separate allocator for strings in unique store.Tor Egge2019-08-1520-24/+567
* | | | | | | | Merge pull request #10300 from vespa-engine/revert-10279-jvenstad/add-custom-...Jon Marius Venstad2019-08-152-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Revert "Add custom path to PATH to run mvn?"Jon Marius Venstad2019-08-152-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #10296 from vespa-engine/bjorncs/nginx-health-check-proxyBjørn Christian Seime2019-08-158-11/+237
|\ \ \ \ \ \ \
| * | | | | | | Only allow proxying https portsBjørn Christian Seime2019-08-151-4/+3
| * | | | | | | Add health check proxy support to jdisc connectorsBjørn Christian Seime2019-08-158-11/+238
* | | | | | | | Merge pull request #10294 from vespa-engine/hmusum/catch-exceptions-instead-o...Håkon Hallingstad2019-08-151-10/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | Handle exception instead of checking first and then do operationHarald Musum2019-08-151-10/+12
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #10271 from vespa-engine/mpolden/disallow-cross-cloud-endp...Martin Polden2019-08-155-21/+115
|\ \ \ \ \ \ \ \
| * | | | | | | | Disallow endpoints containing different cloudsMartin Polden2019-08-143-0/+60
| * | | | | | | | Extract DeploymentSpecValidatorMartin Polden2019-08-142-15/+51
| * | | | | | | | Less GuavaMartin Polden2019-08-141-6/+4
* | | | | | | | | Merge pull request #10295 from vespa-engine/aressem/add-git-to-build-envHarald Musum2019-08-151-0/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | getversion.pl now uses git to get ref and date. Add to build environment for ...Arnstein Ressem2019-08-151-0/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #10290 from vespa-engine/ogronnesby/update-deployment-metr...Øyvind Grønnesby2019-08-153-16/+52
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Improve aggregation over .sum()Øyvind Grønnesby2019-08-153-16/+52
* | | | | | | | Merge pull request #10293 from vespa-engine/bratseth/remove-allocation-by-fla...Jon Bratseth2019-08-1535-771/+244
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Revert "Merge pull request #10281 from vespa-engine/revert-10274-bratseth/rem...Jon Bratseth2019-08-1435-771/+244
* | | | | | | | Merge pull request #10286 from vespa-engine/mpolden/add-vtag-fieldsArnstein Ressem2019-08-155-17/+49
|\ \ \ \ \ \ \ \
| * | | | | | | | Add commit fields to vtagMartin Polden2019-08-155-17/+49
* | | | | | | | | Merge pull request #10287 from vespa-engine/balder/location-and-query-very-di...Henning Baldersheim2019-08-157-88/+15
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | propagate location too.Henning Baldersheim2019-08-151-0/+2