summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3272 from vespa-engine/bjorncs/remove-nettyBjørn Christian Seime2017-08-306-66/+112
|\
| * 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.2Tor Brede Vekterli2017-08-301-2/+2
| |/
* | Merge pull request #3267 from vespa-engine/bratseth/nonfunctional-changesJon Marius Venstad2017-08-306-96/+119
|\ \
| * | 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 deprecatedHarald Musum2017-08-30116-118/+0
* | | | Merge pull request #3253 from vespa-engine/freva/recursive-deleteValerij Fredriksen2017-08-309-56/+147
|\ \ \ \ | |_|_|/ |/| | |
| * | | 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"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 testtoby2017-08-302-6/+6
| | |_|/ | |/| |
* | | | Merge pull request #3264 from vespa-engine/balder/use-malloc-library-that-has...Jon Bratseth2017-08-301-1/+1
|\ \ \ \
| * | | | Since we are having so many issues with libyell we need to use an allocator t...Henning Baldersheim2017-08-301-1/+1
|/ / / /
* | | | 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 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 expirervalerijf2017-08-303-1/+40
|/ / / /
* | | | Merge pull request #3201 from vespa-engine/smorgrav/headroom_allocation_fixTorbjørn Smørgrav2017-08-308-75/+348
|\ \ \ \
| * | | | Add unit tests to preferred re-allocation sortertoby2017-08-291-0/+86
| * | | | Make sorting order for preferred re-allocation node stabletoby2017-08-293-11/+36
| * | | | Only move smallest container from headroom violated hoststoby2017-08-251-7/+18
| * | | | Mark new docker nodes as headroom violators on non-violated hoststoby2017-08-255-45/+69
| * | | | Add two unit tests to reproduce headroom violation bugstoby2017-08-252-23/+150
* | | | | Merge pull request #3256 from vespa-engine/geirst/optimize-remove-batch-in-do...Geir Storli2017-08-303-7/+66
|\ \ \ \ \
| * | | | | Optimize removeBatch() by only doing incGeneration() one time at the end.Geir Storli2017-08-292-7/+19
| * | | | | Add unit test for removeBatch() on DocumentMetaStore.Geir Storli2017-08-291-0/+47
* | | | | | Merge pull request #3234 from vespa-engine/bratseth/store-provisioninfo-witho...Jon Bratseth2017-08-3065-531/+748
|\ \ \ \ \ \
| * | | | | | Remove warningJon Bratseth2017-08-291-1/+1
| * | | | | | Merge with masterJon Bratseth2017-08-28603-1323/+24055
| |\ \ \ \ \ \
| * | | | | | | ProvisionInfo -> AllocatedHostsJon Bratseth2017-08-288-113/+115
| * | | | | | | Add one wimphy testJon Bratseth2017-08-2810-33/+60
| * | | | | | | Allow model evolution which removes clustersJon Bratseth2017-08-287-28/+79
| * | | | | | | Explicitly pass the correct allocated hostsJon Bratseth2017-08-286-40/+62
| * | | | | | | Track API changes, remove warningsJon Bratseth2017-08-285-18/+13
| * | | | | | | ProvisionInfo -> AllocatedHostsJon Bratseth2017-08-2828-208/+246
| * | | | | | | Allocation consistency between model versionsJon Bratseth2017-08-2820-76/+121
| * | | | | | | Allocation consistency between model versionsJon Bratseth2017-08-2829-172/+211
| * | | | | | | Nonfunctional changes onlyJon Bratseth2017-08-238-7/+3
* | | | | | | | Merge pull request #3259 from vespa-engine/hmusum/avoid-validating-xml-twiceJon Bratseth2017-08-291-1/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Avoid validating XML twiceHarald Musum2017-08-291-1/+0
|/ / / / / / / /
* | | | | | | | Merge pull request #3258 from vespa-engine/revert-3248-bjorncs/remove-nettyHenning Baldersheim2017-08-296-133/+64
|\ \ \ \ \ \ \ \