aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 #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
| * | | | Merge with masterJon Bratseth2017-08-30140-1065/+2042
| |\| | |
| * | | | Nonfunctional changesJon Bratseth2017-08-306-96/+117
| | | | |
* | | | | Merge pull request #3260 from vespa-engine/hmusum/remove-version-from-def-filesgjoranv2017-08-30116-118/+0
|\ \ \ \ \ | | | | | | | | | | | | version in def files are deprecated
| * | | | | version in def files are deprecatedHarald Musum2017-08-30116-118/+0
| | |_|_|/ | |/| | |
* | | | | Merge pull request #3253 from vespa-engine/freva/recursive-deleteValerij Fredriksen2017-08-309-56/+147
|\ \ \ \ \ | |_|_|/ / |/| | | | Implement recursive delete in node-repo
| * | | | Remove sys.outvalerijf2017-08-301-1/+0
| | | | |
| * | | | Code review fixesvalerijf2017-08-304-23/+39
| | | | |
| * | | | Fix test in node-adminvalerijf2017-08-301-0/+1
| | | | |
| * | | | Code review fixesvalerijf2017-08-303-23/+43
| | | | |
| * | | | Implement recursive delete in node-repovalerijf2017-08-298-45/+100
| | | | |
* | | | | Merge pull request #3265 from vespa-engine/jvenstad/fix-unit-testJon Bratseth2017-08-301-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Update unit test with "libvespamallocd"
| * | | | | Update unit test with "libvespamallocd"Jon Marius Venstad2017-08-301-3/+3
| | |_|/ / | |/| | |
* | | | | Merge pull request #3262 from vespa-engine/smorgrav/fix_reallocation_orderingTorbjørn Smørgrav2017-08-302-6/+6
|\ \ \ \ \ | | | | | | | | | | | | Fix relocation order readability and improve unit test
| * | | | | Fix relocation order readability and improve unit testtoby2017-08-302-6/+6
| | |_|/ / | |/| | |
* | | | | Merge pull request #3264 from ↵Jon Bratseth2017-08-301-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/balder/use-malloc-library-that-has-better-detection-of-error-usage Since we are having so many issues with libyell we need to use an all…
| * | | | | 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.
* | | | | Merge pull request #3255 from vespa-engine/havardpe/external-data-valueArne H Juul2017-08-3016-4/+233
|\ \ \ \ \ | | | | | | | | | | | | add support for backing data values with external memory
| * | | | | add support for backing data values with external memoryHåvard Pettersen2017-08-2916-4/+233
| | | | | |
* | | | | | Merge pull request #3263 from vespa-engine/freva/add-provisioned-expirerValerij Fredriksen2017-08-303-1/+40
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Add provisioned expirer
| * | | | | Add provisioned expirervalerijf2017-08-303-1/+40
|/ / / / /
* | | | | Merge pull request #3201 from vespa-engine/smorgrav/headroom_allocation_fixTorbjørn Smørgrav2017-08-308-75/+348
|\ \ \ \ \ | | | | | | | | | | | | Allocation headroom fixes