aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #11537 from vespa-engine/freva/remove-use-advertised-featu...Valerij Fredriksen2019-12-101-7/+0
|\
| * Remove use-advertised-resources feature flagValerij Fredriksen2019-12-101-7/+0
* | Merge pull request #11536 from vespa-engine/jvenstad/use-correct-environmentValerij Fredriksen2019-12-101-1/+1
|\ \ | |/ |/|
| * Use given environment, not dev, for default zoneJon Marius Venstad2019-12-101-1/+1
|/
* Merge pull request #11458 from vespa-engine/arnej/use-select2Jon Bratseth2019-12-091-27/+15
|\
| * use select_2 for cell type resolvingArne Juul2019-11-291-27/+15
* | Merge pull request #11528 from vespa-engine/bratseth/tensor-sliceJon Bratseth2019-12-099-339/+574
|\ \
| * | Generalized Slice tensor functionJon Bratseth2019-12-069-339/+574
* | | Merge pull request #11524 from vespa-engine/havardpe/improve-tensor-label-par...Henning Baldersheim2019-12-0910-115/+141
|\ \ \
| * | | improve label parsing in ranking expressionsHåvard Pettersen2019-12-0610-115/+141
* | | | Merge pull request #11517 from vespa-engine/bratseth/minus-sign-in-labelsHenning Baldersheim2019-12-093-5/+5
|\ \ \ \
| * | | | Rename private fieldJon Bratseth2019-12-061-5/+2
| * | | | Allow minus sign at the start of a labelJon Bratseth2019-12-053-1/+4
* | | | | Merge pull request #11525 from vespa-engine/freva/add-api-prefix-to-deploymen...Valerij Fredriksen2019-12-094-8/+9
|\ \ \ \ \
| * | | | | Add testValerij Fredriksen2019-12-062-1/+2
| * | | | | Add optional /api prefix to /deployment/v1 APIValerij Fredriksen2019-12-062-7/+7
* | | | | | Merge pull request #11520 from vespa-engine/revert-11519-revert-11513-toregge...Henning Baldersheim2019-12-094-4/+5
|\ \ \ \ \ \
| * | | | | | Ignore renamed binary file.Tor Egge2019-12-091-1/+1
| * | | | | | Revert "Revert "Use shell script wrapper for vespa-rpc-invoke.""Tor Egge2019-12-053-3/+4
* | | | | | | Merge pull request #11518 from vespa-engine/balder/remove-utctimestampHenning Baldersheim2019-12-0945-219/+184
|\ \ \ \ \ \ \
| * | | | | | | GC unused codeHenning Baldersheim2019-12-062-6/+0
| * | | | | | | Be xplicit.Henning Baldersheim2019-12-062-2/+2
| * | | | | | | Use std::move and remove unneeded constructor.Henning Baldersheim2019-12-061-2/+2
| * | | | | | | Replace UTCTimeStamp with std::chrono::system_clock::time_pointHenning Baldersheim2019-12-0545-215/+186
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #11489 from vespa-engine/ogronnesby/check-meterable-statesØyvind Grønnesby2019-12-092-5/+61
|\ \ \ \ \ \ \
| * | | | | | | Make comment on Node State be more clearØyvind Grønnesby2019-12-051-1/+1
| * | | | | | | Revert change to node repo mock and use different method to add nodesØyvind Grønnesby2019-12-032-5/+2
| * | | | | | | Only include node states that are meterable in meteringØyvind Grønnesby2019-12-033-6/+65
* | | | | | | | Merge pull request #11533 from vespa-engine/revert-11503-bjorncs/extended-ssl...Jon Marius Venstad2019-12-0912-190/+86
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "Move cipher and protocol inclusion/exclusion logic to separate class"Jon Marius Venstad2019-12-092-38/+18
| * | | | | | | | Revert "Add connector config for enabled cipher suites and protocol versions"Jon Marius Venstad2019-12-091-6/+0
| * | | | | | | | Revert "Use cipher/protocol config to configure Jetty"Jon Marius Venstad2019-12-091-48/+21
| * | | | | | | | Revert "Update ABI spec file"Jon Marius Venstad2019-12-091-13/+2
| * | | | | | | | Revert "Allow config of ssl cipher suites and protocol version"Jon Marius Venstad2019-12-098-87/+47
|/ / / / / / / /
* | | | | | | | Merge pull request #11531 from vespa-engine/revert-11487-bjorncs/sslcontext-v...Jon Marius Venstad2019-12-092-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "Allow SSLContext implementation that supports TLSv1.3+"Valerij Fredriksen2019-12-092-3/+3
|/ / / / / / / /
* | | | | | | | Merge pull request #11523 from vespa-engine/hmusum/only-remove-unused-CNAMEs-...Morten Tokle2019-12-061-2/+9
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Only remove unused CNAMEs when removing obsolete policiesHarald Musum2019-12-061-2/+9
|/ / / / / / /
* | | | | | | Merge pull request #11521 from vespa-engine/revert-11477-dependabot/maven/con...Arnstein Ressem2019-12-061-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Revert "Bump jetty.version from 9.4.22.v20191022 to 9.4.24.v20191120 in /cont...Henning Baldersheim2019-12-051-1/+1
|/ / / / / /
* | | | | | Merge pull request #11519 from vespa-engine/revert-11513-toregge/use-shell-wr...Valerij Fredriksen2019-12-053-4/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Revert "Use shell script wrapper for vespa-rpc-invoke."Harald Musum2019-12-053-4/+3
|/ / / / /
* | | | | Merge pull request #11515 from vespa-engine/freva/cpuCoresValerij Fredriksen2019-12-0519-3/+40
|\ \ \ \ \
| * | | | | Add cpuCores to node-admin NodeSpecValerij Fredriksen2019-12-053-3/+23
| * | | | | Add cpuCores to node responseValerij Fredriksen2019-12-0516-0/+17
* | | | | | Merge pull request #11507 from vespa-engine/balder/use-duration-in-messagebus...Henning Baldersheim2019-12-0584-638/+581
|\ \ \ \ \ \
| * | | | | | Follow PR comments.Henning Baldersheim2019-12-052-14/+11
| * | | | | | Merge branch 'master' into balder/use-duration-in-messagebus-and-storageapi-r...Henning Baldersheim2019-12-05119-387/+1134
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Need larger timeout for testing on satuyrated hw.Henning Baldersheim2019-12-041-1/+1
| * | | | | | Use getReplyNow and deque() for immediate poll.Henning Baldersheim2019-12-042-5/+5