aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3285 from vespa-engine/arnej/render-inf-relevance-as-0Arne H Juul2017-08-313-3/+7
|\ | | | | render infinite or NaN relevance as "0.0"
| * render infinite or NaN relevance as "0.0"Arne Juul2017-08-313-3/+7
|/
* Merge pull request #3251 from vespa-engine/bjorncs/reduce-mem-usage-configserverBjørn Christian Seime2017-08-311-0/+4
|\ | | | | Reduce number of config server worker threads from default (500)
| * Reduce number of worker threads from default (500)Bjørn Christian Seime2017-08-291-0/+4
| | | | | | | | | | Reduce the number of worker threads will have a positive impact on the memory consumption.
* | Merge pull request #3284 from vespa-engine/bjorncs/stabilize-testArnstein Ressem2017-08-311-1/+1
|\ \ | | | | | | Stabilize test
| * | Stabilize testBjørn Christian Seime2017-08-311-1/+1
|/ /
* | Merge pull request #3269 from ↵Geir Storli2017-08-3121-147/+310
|\ \ | | | | | | | | | | | | vespa-engine/toregge/refactor-gid-to-lid-change-handler-usage Toregge/refactor gid to lid change handler usage
| * | Remove unneeded checks.Tor Egge2017-08-301-6/+0
| | |
| * | Propagate API changes to GidToLidChangeListener and ReferenceAttribute:Tor Egge2017-08-3013-88/+150
| | | | | | | | | | | | Split put and remove notifications into separate methods.
| * | Change API for IGidToLidChangeHandler:Tor Egge2017-08-3010-21/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace notifyGidToLidChanged() with notifyPut(), notifyRemove() and notifyRemoveDone(). Intended usage: Call rotifyRemove() at start of remove operation then call notifyRemoveDone() at completion of remove operation. Call notifyPut() at end of put operation. For now, call them at start of put/remove operations to get old behavior. Track pending remove operations. Ignore put for gid while remove is pending. Merge pending remove operations.
| * | Prepare for gid to lid change notifications coming from differentTor Egge2017-08-304-69/+37
| | | | | | | | | | | | threads.
* | | Merge pull request #3282 from ↵Harald Musum2017-08-314-44/+4
|\ \ \ | | | | | | | | | | | | | | | | vespa-engine/revert-3271-gjoranv/exclude-antlr-from-provided-deps Revert "Make antlr and antlr4 invisible for customer projects."
| * | | Revert "Make antlr and antlr4 invisible for customer projects."Arnstein Ressem2017-08-314-44/+4
|/ / /
* | | Merge pull request #3281 from ↵Henning Baldersheim2017-08-3012-20/+20
|\ \ \ | | | | | | | | | | | | | | | | vespa-engine/balder/give-vespamallocxx-their-old-names-back Give the libvespamallocXXX back their old names.
| * | | Update tests with correct library name.Henning Baldersheim2017-08-309-12/+12
| | | |
| * | | Update unit test with "libvespamallocd"Jon Marius Venstad2017-08-301-3/+3
| | | |
| * | | Since we are having so many issues with libyell we need to use an allocator ↵Henning Baldersheim2017-08-301-1/+1
| | | | | | | | | | | | | | | | that has earlier detection of missuse.
| * | | Give the libvespamallocXXX back their old names.Henning Baldersheim2017-08-301-4/+4
| | | |
* | | | Merge pull request #3261 from ↵Henning Baldersheim2017-08-303-1/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | vespa-engine/balder/prereserve-for-expected-number-of-fields Presize the hashmaps where possible to reduce resizing.
| * | | | Compensate for loadfactor, and use correct fieldcount at the right place, ↵Henning Baldersheim2017-08-302-8/+5
| | | | | | | | | | | | | | | | | | | | instead of the pragmatic imprecise initial take.
| * | | | Presize the hashmaps where possible to reduce resizing.Henning Baldersheim2017-08-303-3/+21
| | |/ / | |/| |
* | | | Merge pull request #3276 from ↵Henning Baldersheim2017-08-307-16/+19
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | vespa-engine/havardpe/use--inf-as-default-rank-value Havardpe/use inf as default rank value
| * | | update matching testHåvard Pettersen2017-08-301-3/+3
| | | |
| * | | update hit collector testHåvard Pettersen2017-08-301-5/+5
| | | |
| * | | use predefined default rank value (-inf) when not knownHåvard Pettersen2017-08-305-8/+11
| | | |
* | | | Merge pull request #3280 from vespa-engine/bratseth/simplify-validate-zonesMartin Polden2017-08-3087-121/+183
|\ \ \ \ | | | | | | | | | | Bratseth/simplify validate zones
| * | | | Simplify testJon Bratseth2017-08-301-4/+0
| | | | |
| * | | | Remove dead codeJon Bratseth2017-08-301-27/+0
| | | | |
| * | | | SimplifyJon Bratseth2017-08-302-3/+25
| | | | |
| * | | | Nonfunctional changesJon Bratseth2017-08-3085-91/+162
| | | | |
* | | | | Merge pull request #3278 from vespa-engine/bratseth/contributingKristian Aune2017-08-301-52/+34
|\ \ \ \ \ | |/ / / / |/| | | | Contributing
| * | | | ContributingJon Bratseth2017-08-301-52/+34
| | | | |
* | | | | Merge pull request #3277 from vespa-engine/revert-3272-bjorncs/remove-nettyJon Bratseth2017-08-306-112/+66
|\ \ \ \ \ | | | | | | | | | | | | Revert "Bjorncs/remove netty"
| * | | | | Revert "Bjorncs/remove netty"Harald Musum2017-08-306-112/+66
|/ / / / /
* | | | | Merge pull request #3270 from ↵Jon Bratseth2017-08-308-20/+200
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/mpolden/parallel-tag-in-deployment-xml Read parallel tag from deployment.xml
| * | | | | Read parallel tag from deployment.xmlMartin Polden2017-08-308-20/+200
| | |_|/ / | |/| | |
* | | | | Merge pull request #3275 from ↵gjoranv2017-08-30116-0/+118
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/revert-3260-hmusum/remove-version-from-def-files Revert "version in def files are deprecated"
| * | | | | Revert "version in def files are deprecated"Harald Musum2017-08-30116-0/+118
|/ / / / /
* | | | | Merge pull request #3273 from vespa-engine/revert-3265-jvenstad/fix-unit-testHarald Musum2017-08-301-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Revert "Update unit test with "libvespamallocd""
| * | | | | Revert "Update unit test with "libvespamallocd""Arnstein Ressem2017-08-301-3/+3
| | | | | |
* | | | | | Merge pull request #3274 from ↵Harald Musum2017-08-301-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/revert-3264-balder/use-malloc-library-that-has-better-detection-of-error-usage Revert "Since we are having so many issues with libyell we need to use an all…"
| * | | | | | Revert "Since we are having so many issues with libyell we need to use an ↵Arnstein Ressem2017-08-301-1/+1
| | |_|/ / / | |/| | | | | | | | | | | | | | | | all…"
* | | | | | Merge pull request #3271 from ↵Bjørn Christian Seime2017-08-304-4/+44
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | vespa-engine/gjoranv/exclude-antlr-from-provided-deps Make antlr and antlr4 invisible for customer projects.
| * | | | | Make antlr and antlr4 invisible for customer projects.gjoranv2017-08-304-4/+44
| | | | | | | | | | | | | | | | | | | | | | | | - Visible only in test classpath.
* | | | | | Merge pull request #3272 from vespa-engine/bjorncs/remove-nettyBjørn Christian Seime2017-08-306-66/+112
|\ \ \ \ \ \ | | | | | | | | | | | | | | Bjorncs/remove netty
| * | | | | | Store maxage as secondsBjørn Christian Seime2017-08-301-10/+8
| | | | | | |
| * | | | | | Remove Netty by replacing cookie codec with Jetty + Java SEBjørn Christian Seime2017-08-306-60/+108
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #3268 from vespa-engine/vekterli/bump-clion-version-2017-2-2Geir Storli2017-08-301-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Bump CLion version to 2017.2.2
| * | | | | | Bump CLion version to 2017.2.2Tor Brede Vekterli2017-08-301-2/+2
| |/ / / / /
* | | | | | Merge pull request #3267 from vespa-engine/bratseth/nonfunctional-changesJon Marius Venstad2017-08-306-96/+119
|\ \ \ \ \ \ | | | | | | | | | | | | | | Nonfunctional changes