aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Warn about missing overrideHenning Baldersheim2017-04-221-1/+1
* Merge pull request #2230 from yahoo/havardpe/vespalib-socketsArne H Juul2017-04-2230-522/+289
|\
| * handle sig int in separate threadHaavard2017-04-211-1/+10
| * let socket handle handle more socket stuffHaavard2017-04-2130-521/+279
* | Merge pull request #2221 from yahoo/arnej/add-Werror-in-bundle-pluginArne H Juul2017-04-223-5/+30
|\ \
| * | enable more warningsArne H Juul2017-04-211-1/+14
| * | enable more warningsArne H Juul2017-04-211-1/+8
| * | enable more warningsArne H Juul2017-04-211-3/+8
| |/
* | Merge pull request #2233 from yahoo/balder/felix-5.6Henning Baldersheim2017-04-221-2/+2
|\ \
| * | Up felix to 5.6Henning Baldersheim2017-04-221-2/+2
* | | Merge pull request #2232 from yahoo/toregge/handle-missing-attribute-in-attri...Henning Baldersheim2017-04-222-5/+19
|\ \ \ | |/ / |/| |
| * | Handle missing attribute in attribute blueprint factory.Tor Egge2017-04-222-5/+19
* | | Merge pull request #2231 from yahoo/balder/latest-felix-4Henning Baldersheim2017-04-223-3/+21
|\ \ \ | |/ / |/| |
| * | Implement additional required proxy methods by felix 4.6.1 compared to 4.2.1.Henning Baldersheim2017-04-222-0/+18
| * | Use latest felix 4.Henning Baldersheim2017-04-221-3/+3
|/ /
* | Merge pull request #2229 from yahoo/balder/breakfix-maintenancecontroller-testHenning Baldersheim2017-04-211-2/+4
|\ \
| * | Must use a separate executor. Can not run the config change in the generic ex...Henning Baldersheim2017-04-211-2/+4
|/ /
* | Merge pull request #2225 from yahoo/balder/also-sync-generic-executor-in-mast...Henning Baldersheim2017-04-211-2/+2
|\ \
| * | generic executor must be synced independed of being invoked by master thread ...Henning Baldersheim2017-04-211-2/+2
* | | Merge pull request #2227 from yahoo/geirst/only-update-maintenance-controller...Tor Egge2017-04-217-54/+123
|\ \ \
| * | | Simplify use of ComparisonResult.Geir Storli2017-04-211-38/+25
| * | | Only change MaintenanceController if config has changed during re-config.Geir Storli2017-04-215-1/+78
| * | | Consolidate naming of variables in struct DocumentDBConfig::ComparisonResult.Geir Storli2017-04-216-34/+39
* | | | Merge pull request #2215 from yahoo/revert-2213-revert-2202-balder/fast-acces...Henning Baldersheim2017-04-216-95/+195
|\ \ \ \
| * | | | Update expected answer in test too.Henning Baldersheim2017-04-201-1/+1
| * | | | AttributesConfigProducer must not inherit config from StreamingSearchCluster.Henning Baldersheim2017-04-201-1/+1
| * | | | Revert "Revert "Balder/fast access fields are also in memory for streaming se...Henning Baldersheim2017-04-206-95/+195
| |/ / /
* | | | Merge pull request #2226 from yahoo/revert-2220-bjorncs/remove-netty-usageArnstein Ressem2017-04-214-17/+105
|\ \ \ \
| * | | | Revert "Remove some netty usage in jdisc_http_service"Bjørn Christian Seime2017-04-214-17/+105
|/ / / /
* | | | Merge pull request #2223 from yahoo/balder/use-latest-netty-3.6Jon Bratseth2017-04-211-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Due to https://github.com/netty/netty/pull/2868 we need at least 3.6.10.Final.Henning Baldersheim2017-04-211-1/+1
|/ / /
* | | Merge pull request #2222 from yahoo/bratseth/16-distribution-bits-in-eu-west-1Yngve Aasheim2017-04-211-0/+1
|\ \ \
| * | | 16 distribution bits in eu-west-1Jon Bratseth2017-04-211-0/+1
|/ / /
* | | Merge pull request #2218 from yahoo/toregge/add-factory-method-for-delaying-a...Geir Storli2017-04-215-69/+139
|\ \ \
| * | | Adjust log message when delaying attribute aspect changes.Tor Egge2017-04-211-2/+2
| * | | Adjust method parameter names.Tor Egge2017-04-212-25/+25
| * | | Apply config with delayed attribute aspect changes instead of rejectingTor Egge2017-04-212-65/+9
| * | | Add factory method for delaying attribute aspect changes in document db config.Tor Egge2017-04-213-3/+129
| |/ /
* | | Merge pull request #2219 from yahoo/arnej/more-warnings-in-applicationJon Bratseth2017-04-214-4/+11
|\ \ \
| * | | disallow warningsArne H Juul2017-04-211-0/+1
| * | | suppress deprecation warnings about rendererArne H Juul2017-04-211-0/+2
| * | | turn on more warningsArne H Juul2017-04-211-3/+2
| * | | avoid silly try-with-resources warningArne H Juul2017-04-211-0/+5
| * | | auto-closable resource should not throw from close()Arne H Juul2017-04-211-1/+1
| | |/ | |/|
* | | Merge pull request #2220 from yahoo/bjorncs/remove-netty-usagegjoranv2017-04-214-105/+17
|\ \ \ | |/ / |/| |
| * | Remove some netty usage in jdisc_http_serviceBjørn Christian Seime2017-04-214-105/+17
* | | Merge pull request #2216 from yahoo/arnej/add-Werror-in-yoleanBjørn Christian Seime2017-04-213-14/+10
|\ \ \
| * | | disable bogus varargs warningsArne H Juul2017-04-211-0/+2
| * | | add explicitly-unknown type parameterArne H Juul2017-04-212-2/+2
| * | | use generics moreArne H Juul2017-04-211-12/+6