summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove usage of wipe history.Tor Egge2017-04-2613-52/+7
* Add override.Tor Egge2017-04-261-1/+1
* Merge pull request #2248 from yahoo/havardpe/more-socket-options-and-testingArne H Juul2017-04-258-6/+93
|\
| * support async connect (and listen)Haavard2017-04-248-6/+93
* | Merge pull request #2251 from yahoo/havardpe/remove-fnet-fdselectorArne H Juul2017-04-2510-561/+0
|\ \
| * | remove fdselector from fnet (not used)Haavard2017-04-2410-561/+0
| |/
* | Merge pull request #2270 from yahoo/arnej/add-Werror-documentapiHaakon Dybdahl2017-04-256-6/+30
|\ \
| * | disallow warningsArne H Juul2017-04-251-3/+4
| * | use genericsArne H Juul2017-04-251-3/+3
| * | add hashCode()Arne H Juul2017-04-254-0/+23
|/ /
* | Merge pull request #2268 from yahoo/balder/no-virtual-on-override-in-storageTor Brede Vekterli2017-04-25112-1041/+679
|\ \
| * | optimize includes.Henning Baldersheim2017-04-2512-46/+22
| * | Add missing override.Henning Baldersheim2017-04-255-60/+46
| * | - Optimize includes.Henning Baldersheim2017-04-2598-936/+612
|/ /
* | Merge pull request #2267 from yahoo/vekterli/separate-compiler-warnings-for-c...Henning Baldersheim2017-04-251-4/+8
|\ \
| * | Separate compiler warnings for C and C++Tor Brede Vekterli2017-04-251-4/+8
* | | 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
|\ \ \