summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge pull request #2260 from yahoo/balder/deinline-in-storageserverTor Brede Vekterli2017-04-2515-360/+274
|\ \ \
| * | | Add missing files.Henning Baldersheim2017-04-242-0/+109
| * | | - Deinline large metrics constructors/destructors.Henning Baldersheim2017-04-2413-360/+165
* | | | Merge pull request #2266 from yahoo/arnej/add-Werror-container-coregjoranv2017-04-251-0/+10
|\ \ \ \
| * | | | disallow some warningsArne H Juul2017-04-251-0/+10
| | |/ / | |/| |
* | | | Merge pull request #2265 from yahoo/arnej/add-Werror-processingJon Bratseth2017-04-251-0/+16
|\ \ \ \
| * | | | disallow some warningsArne H Juul2017-04-251-0/+16
|/ / / /
* | | | Merge pull request #2264 from yahoo/revert-2231-balder/latest-felix-4Arnstein Ressem2017-04-253-21/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Revert "Balder/latest felix 4"gjoranv2017-04-253-21/+3
|/ / /
* | | Merge pull request #2261 from yahoo/revert-2233-balder/felix-5.6Arnstein Ressem2017-04-251-2/+2
|\ \ \
| * | | Revert "Up felix to 5.6"gjoranv2017-04-251-2/+2
|/ / /
* | | Merge pull request #2259 from yahoo/revert-2258-bjorncs/include-jetty-utilBjørn Christian Seime2017-04-241-4/+1
|\ \ \
| * | | Revert "Add compile dependency on jetty-util "Arnstein Ressem2017-04-241-4/+1
|/ / /
* | | Merge pull request #2258 from yahoo/bjorncs/include-jetty-utilArnstein Ressem2017-04-241-1/+4
|\ \ \ | |/ / |/| |
| * | Add compile dependency on jetty-utilBjørn Christian Seime2017-04-241-1/+4
|/ /
* | Merge pull request #2257 from yahoo/revert-2256-bjorncs/upgrade-nettyHenning Baldersheim2017-04-248-39/+80
|\ \
| * | Revert "Bjorncs/upgrade netty"Henning Baldersheim2017-04-248-39/+80
|/ /
* | Merge pull request #2256 from yahoo/bjorncs/upgrade-nettyHenning Baldersheim2017-04-248-80/+39
|\ \
| * | Remove unused constantsBjørn Christian Seime2017-04-241-4/+0
| * | Remove some netty usage in jdisc_http_serviceBjørn Christian Seime2017-04-243-42/+19
| * | Upgrade to Netty 3.10.6Bjørn Christian Seime2017-04-244-34/+20
|/ /
* | Merge pull request #2255 from yahoo/bjorncs/cleanup-metrics-testHenning Baldersheim2017-04-241-100/+0
|\ \
| * | Remove non-working unit testsBjørn Christian Seime2017-04-241-100/+0
* | | Merge pull request #2254 from yahoo/bjorncs/enable-all-testsHenning Baldersheim2017-04-245-116/+2
|\ \ \ | |/ / |/| |
| * | Remove non-working HTTP trailers testBjørn Christian Seime2017-04-241-72/+0
| * | Remove non-working tracing testBjørn Christian Seime2017-04-244-43/+1
| * | Enable disabled testBjørn Christian Seime2017-04-241-1/+1
|/ /
* | Merge pull request #2253 from yahoo/bjorncs/remove-ningHenning Baldersheim2017-04-2430-2629/+0
|\ \
| * | Remove HttpClient from jdisc_http_serviceBjørn Christian Seime2017-04-2430-2629/+0
|/ /
* | Merge pull request #2250 from yahoo/toregge/remove-wipe-history-usageGeir Storli2017-04-249-88/+1
|\ \
| * | Remove usage of wipe history.Tor Egge2017-04-245-45/+1
| * | Remove usage of wipe history.Tor Egge2017-04-242-15/+0
| * | Remove usage of wipe history.Tor Egge2017-04-242-28/+0
* | | Merge pull request #2249 from yahoo/geirst/adjust-config-for-maintenance-jobsTor Egge2017-04-249-39/+105
|\ \ \
| * | | Change default lid space compaction interval to 10 minutes.Geir Storli2017-04-241-2/+2
| * | | Calculate prune removed documents interval based on age if set to 0.Geir Storli2017-04-243-14/+26
| * | | Set maintenance job delay for lid space compaction and prune removed document...Geir Storli2017-04-246-23/+77
|/ / /
* | | Merge pull request #2246 from yahoo/bratseth/add-version-to-state-v1gjoranv2017-04-244-19/+44
|\ \ \ | |/ / |/| |
| * | Add state/v1/version path returning the Vespa versionJon Bratseth2017-04-244-19/+44
* | | Merge pull request #2244 from yahoo/balder/optimize-streaming-1Henning Baldersheim2017-04-2421-175/+141
|\ \ \
| * | | Put the start and end iterators into a Range class for simplicity and readabi...Henning Baldersheim2017-04-2421-175/+141
| * | | Enable the override warning.Henning Baldersheim2017-04-231-1/+1
* | | | Merge pull request #2228 from yahoo/toregge/cleanup-no-longer-reject-configGeir Storli2017-04-2445-1845/+53
|\ \ \ \
| * | | | Remove newly unused config.Tor Egge2017-04-241-10/+0
| * | | | Remove history schema and wiping of old removed fields.Tor Egge2017-04-2425-699/+51
| * | | | Remove dead code for handling config being rejected.Tor Egge2017-04-2423-1136/+2
* | | | | Merge pull request #2245 from yahoo/balder/do-not-provide-sync-by-defaultTor Egge2017-04-241-2/+1
|\ \ \ \ \
| * | | | | Remove unused include.Henning Baldersheim2017-04-241-1/+0
| * | | | | Do not enforce sync unless requested.Henning Baldersheim2017-04-241-1/+1
|/ / / / /
* | | | | Merge pull request #2242 from yahoo/arnej/add-Werror-logserverHarald Musum2017-04-245-10/+10
|\ \ \ \ \