summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* add canonical empty PointArne H Juul2016-11-081-0/+5
* add unit test exposing bug in conversion, and a minimal fixArne H Juul2016-11-082-3/+57
* Merge pull request #1032 from yahoo/hmusum/add-json-accesslog-to-xml-schemaFrode Lundgren2016-11-084-6/+8
|\
| * Add accesslog type 'json' to schemaHarald Musum2016-11-084-6/+8
* | Merge pull request #1030 from yahoo/bratseth/deprecate-xml-doc-formatKristian Aune2016-11-081-0/+1
|\ \ | |/ |/|
| * Deprecate the xml document formatJon Bratseth2016-11-071-0/+1
* | Merge pull request #1031 from yahoo/hmusum/remove-loggingMartin Polden2016-11-071-1/+0
|\ \
| * | Remove loggingHarald Musum2016-11-071-1/+0
|/ /
* | Merge pull request #1029 from yahoo/bjorncs/jetty-experimentationHenning Baldersheim2016-11-072-10/+19
|\ \
| * | Use janitor thread pool instead of ad-hoc threadBjørn Christian Seime2016-11-071-2/+4
| * | Use fixed size buffer for request contentBjørn Christian Seime2016-11-071-4/+2
| * | Don't call blocking sendError from non-blocking contextBjørn Christian Seime2016-11-071-6/+15
|/ /
* | Merge pull request #1028 from yahoo/bratseth/correct-checkHenning Baldersheim2016-11-071-1/+2
|\ \ | |/ |/|
| * Correct condition for adding trace messageJon Bratseth2016-11-071-1/+2
|/
* Merge pull request #1027 from yahoo/bjorncs/jetty-experimentationBjørn Christian Seime2016-11-073-4/+20
|\
| * Complete early in ServletRequestReader if response is already committedBjørn Christian Seime2016-11-073-3/+17
| * Revert "Don't call available()"Bjørn Christian Seime2016-11-071-1/+3
* | Go back to debug logging (#1025)Harald Musum2016-11-071-5/+5
|/
* Merge pull request #1022 from yahoo/arnej/ensure-some-metrics-existJon Bratseth2016-11-061-0/+4
|\
| * initialize metricArne H Juul2016-11-051-0/+4
* | Merge pull request #1024 from yahoo/gjoranv/metric-setgjoranv2016-11-068-310/+510
|\ \
| * | Add MetricSet abstraction and a VespaMetricSet.gjoranv2016-11-068-310/+510
* | | Merge pull request #1023 from yahoo/bjorncs/jetty-experimentationBjørn Christian Seime2016-11-052-26/+11
|\ \ \ | |_|/ |/| |
| * | Revert "Assert servlet input/output streams are in ready state before complet...Bjørn Christian Seime2016-11-052-26/+11
|/ /
* | Merge pull request #1020 from yahoo/frodelu/update-json-log-formatHarald Musum2016-11-052-47/+72
|\ \ | |/ |/|
| * Implement changes after architecture review:Frode Lundgren2016-11-032-47/+72
* | Merge pull request #1016 from yahoo/revert-1013-revert-1002-vegard/fix-parsin...Vegard Sjonfjell2016-11-045-13/+66
|\ \
| * | Code review changesVegard Sjonfjell2016-11-041-3/+3
| * | Fix leakVegard Sjonfjell2016-11-041-2/+2
| * | Revert "Revert "Vegard/fix parsing of fieldnames""Vegard Sjonfjell2016-11-045-13/+66
* | | Make the Metric class immutable. (#1021)gjoranv2016-11-044-37/+36
* | | Merge pull request #1019 from yahoo/geirst/move-datastore-code-into-separate-...Tor Egge2016-11-04125-458/+477
|\ \ \
| * | | Remove no-needed namespace prefix.Geir Storli2016-11-041-15/+15
| * | | Move datastore unit tests into separate folder.Geir Storli2016-11-047-9/+12
| * | | Move docstore unit tests into common top-level folder.Geir Storli2016-11-0428-3/+3
| * | | Move datastore code from search::btree -> search::datastore.Geir Storli2016-11-0479-401/+406
| * | | Move datastore classes to separate sub library.Geir Storli2016-11-0350-50/+61
* | | | Merge pull request #1018 from yahoo/toregge/move-hwinfo-to-searchcoreGeir Storli2016-11-0435-222/+146
|\ \ \ \
| * | | | Add skeleton of class that samples hardware to derive infoTor Egge2016-11-045-1/+44
| * | | | Move HwInfo from vespalib to searchcore and simplify code.Tor Egge2016-11-0432-222/+103
| | |/ / | |/| |
* | | | Merge pull request #1017 from yahoo/bjorncs/jetty-experimentationBjørn Christian Seime2016-11-043-12/+27
|\ \ \ \ | |/ / / |/| | |
| * | | Assert servlet input/output streams are in ready state before completionBjørn Christian Seime2016-11-042-11/+26
| * | | Revert "Call AsyncContext.complete() when response is completed"Bjørn Christian Seime2016-11-041-1/+1
|/ / /
* | | Merge pull request #1015 from yahoo/balder/jetty-9.3.14Henning Baldersheim2016-11-041-1/+1
|\ \ \
| * | | Jetty 9.3.14Henning Baldersheim2016-11-041-1/+1
|/ / /
* | | Merge pull request #1014 from yahoo/toregge/pass-on-hwinfo-to-new-attribute-m...Geir Storli2016-11-041-1/+2
|\ \ \
| * | | Pass on hwinfo from old attribute manager to new attribute manager.Tor Egge2016-11-041-1/+2
| |/ /
* | | Merge pull request #1013 from yahoo/revert-1002-vegard/fix-parsing-of-fieldnamesArnstein Ressem2016-11-045-66/+13
|\ \ \
| * | | Revert "Vegard/fix parsing of fieldnames"Arnstein Ressem2016-11-045-66/+13
|/ / /
* | | Merge pull request #1012 from yahoo/bjorncs/jetty-experimentationBjørn Christian Seime2016-11-031-1/+1
|\ \ \