summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* no virtual on override + optimize includes.Henning Baldersheim2017-04-2635-232/+75
* Merge pull request #2279 from yahoo/bjorncs/dont-use-netty-deprecatedBjørn Christian Seime2017-04-2610-271/+156
|\
| * Remove unused dependencyBjørn Christian Seime2017-04-261-4/+0
| * Remove use of deprecated cookie API of Netty.Bjørn Christian Seime2017-04-269-267/+156
* | Merge pull request #2302 from yahoo/hmusum/fix-dependenciesArnstein Ressem2017-04-261-7/+1
|\ \
| * | Revert and fix changes to dependenciesHarald Musum2017-04-261-7/+1
|/ /
* | Merge pull request #2301 from yahoo/revert-2300-revert-2294-revert-2293-rever...Jon Bratseth2017-04-261-2/+16
|\ \
| * | Fix variable nameHarald Musum2017-04-261-1/+1
| * | Revert "Revert "Revert "Revert "Catch exception thrown from AbstractComponent...Harald Musum2017-04-261-2/+16
|/ /
* | Merge pull request #2300 from yahoo/revert-2294-revert-2293-revert-2286-gjora...Jon Bratseth2017-04-261-16/+2
|\ \
| * | Revert "Revert "Revert "Catch exception thrown from AbstractComponent.deconst...Harald Musum2017-04-261-16/+2
|/ /
* | Merge pull request #2297 from yahoo/freva/fix-coredump-reportingHarald Musum2017-04-262-23/+40
|\ \
| * | Always check if metadata.json exists, if not - create it.valerijf2017-04-262-23/+40
* | | Merge pull request #2295 from yahoo/balder/override-in-persistenceTor Brede Vekterli2017-04-26101-556/+342
|\ \ \
| * | | Include correct file.Henning Baldersheim2017-04-261-1/+2
| * | | Optimize includes and add override.Henning Baldersheim2017-04-2615-81/+52
| * | | Optimize includes and add override.Henning Baldersheim2017-04-2687-477/+291
| |/ /
* | | Merge pull request #2296 from yahoo/musum/configure-http-client-timeoutsValerij Fredriksen2017-04-261-1/+13
|\ \ \
| * | | Set connection timeoutsHarald Musum2017-04-261-1/+13
| | |/ | |/|
* | | Merge pull request #2294 from yahoo/revert-2293-revert-2286-gjoranv/catch-exc...Henning Baldersheim2017-04-261-2/+16
|\ \ \ | |_|/ |/| |
| * | Differentiate between Exception, Error and Throwable.Henning Baldersheim2017-04-261-5/+6
| * | Sleep a random number of seconds between 0 and 180s do avoid syncronized clus...Henning Baldersheim2017-04-261-0/+4
| * | Revert "Revert "Catch exception thrown from AbstractComponent.deconstruct.""Henning Baldersheim2017-04-261-2/+11
|/ /
* | Merge pull request #2293 from yahoo/revert-2286-gjoranv/catch-exception-in-de...Henning Baldersheim2017-04-261-11/+2
|\ \
| * | Revert "Catch exception thrown from AbstractComponent.deconstruct."Henning Baldersheim2017-04-261-11/+2
|/ /
* | Merge pull request #2286 from yahoo/gjoranv/catch-exception-in-deconstructHenning Baldersheim2017-04-261-2/+11
|\ \
| * | Print stacktrace for exceptions and die upon errors.gjoranv2017-04-261-3/+6
| * | Catch exception thrown from AbstractComponent.deconstruct.gjoranv2017-04-261-2/+8
* | | Merge pull request #2291 from yahoo/toregge/save-empty-history-schemaHenning Baldersheim2017-04-261-0/+5
|\ \ \
| * | | Save empty history schema, to allow for limited vespa version downgrade.Tor Egge2017-04-261-0/+5
* | | | Merge pull request #2283 from yahoo/balder/no-virtual-on-override-in-documentapiTor Brede Vekterli2017-04-26179-893/+401
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add missing file.Henning Baldersheim2017-04-251-0/+9
| * | | Add override in documentapi.Henning Baldersheim2017-04-2556-288/+142
| * | | Add the overrides and you are backin business.Henning Baldersheim2017-04-251-10/+5
| * | | This change triggers the override warning ..... Not on system included files....Henning Baldersheim2017-04-251-1/+1
| * | | optimize includeHenning Baldersheim2017-04-2510-38/+25
| * | | Add missing override.Henning Baldersheim2017-04-25117-557/+220
* | | | Merge pull request #2285 from yahoo/bjorncs/remove-jetty-deps-container-devBjørn Christian Seime2017-04-261-10/+0
|\ \ \ \
| * | | | Remove Jetty deps from container-devBjørn Christian Seime2017-04-251-10/+0
* | | | | Merge pull request #2289 from yahoo/geirst/tune-proton-config-based-on-node-f...Jon Bratseth2017-04-269-6/+145
|\ \ \ \ \
| * | | | | Tune proton config based on flavor if this is present for the search node.Geir Storli2017-04-265-6/+72
| * | | | | Add class for tuning proton config based on node flavor of a search node.Geir Storli2017-04-262-0/+66
| * | | | | Add config for whether the disk is fast or slow (default is fast).Geir Storli2017-04-262-0/+7
* | | | | | Merge pull request #2290 from yahoo/bjorncs/handle-null-parametersBjørn Christian Seime2017-04-261-0/+3
|\ \ \ \ \ \
| * | | | | | Return empty cookie list on 'null'Bjørn Christian Seime2017-04-261-0/+3
|/ / / / / /
* | | | | | Merge pull request #2280 from yahoo/bratseth/maintenance-job-controlJon Bratseth2017-04-2651-323/+771
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Make field finalJon Bratseth2017-04-261-1/+1
| * | | | | More functionally completeJon Bratseth2017-04-262-4/+5
| * | | | | Remove temporary codeJon Bratseth2017-04-261-2/+1
| * | | | | Fix dependenciesJon Bratseth2017-04-252-1/+13