summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove whitespaceHenning Baldersheim2018-08-1245-117/+117
* Remove whitespaceHenning Baldersheim2018-08-1232-51/+51
* Remove whitespaceHenning Baldersheim2018-08-1233-71/+71
* Remove extra whitespaceHenning Baldersheim2018-08-128-11/+11
* Merge pull request #6554 from vespa-engine/balder/pass-stringref-by-valueHenning Baldersheim2018-08-11283-964/+934
|\
| * Avoid ambiguity in gcc 8.2Henning Baldersheim2018-08-111-1/+1
| * Pass stringref by valueHenning Baldersheim2018-08-1148-128/+128
| * Pass stringref by valueHenning Baldersheim2018-08-1126-80/+74
| * Pass stringref by valueHenning Baldersheim2018-08-1158-85/+85
| * Pass stringref by valueHenning Baldersheim2018-08-113-13/+13
| * Pass stringref by valueHenning Baldersheim2018-08-104-29/+29
| * Pass stringref by valueHenning Baldersheim2018-08-1086-259/+248
| * Pass stringref by valueHenning Baldersheim2018-08-1083-205/+192
| * Pass stringref by valueHenning Baldersheim2018-08-1037-190/+190
* | Merge pull request #6553 from vespa-engine/revert-6512-henrhoi/object-structu...Henning Baldersheim2018-08-106-36/+48
|\ \
| * | Revert "Added a object structure for GroupingRequest objects, accessable from...Henning Baldersheim2018-08-106-36/+48
|/ /
* | Merge pull request #6552 from vespa-engine/jvenstad/deploymentsJon Bratseth2018-08-1020-194/+516
|\ \ | |/ |/|
| * Added scenario tests where everything succeed, and fixed bugsJon Marius Venstad2018-08-105-6/+215
| * Handle deployment spec, and mock itJon Marius Venstad2018-08-104-27/+37
| * Modifiable ConfigChangeActions, mock provisioning and re(boot)|(start)Jon Marius Venstad2018-08-103-9/+111
| * Make RoutingGeneratorMock modifiableJon Marius Venstad2018-08-103-20/+40
| * Renaming and minor cleanupJon Marius Venstad2018-08-108-32/+30
| * Use arguments instead of ThreadLocalJon Marius Venstad2018-08-091-66/+67
| * CleanupJon Marius Venstad2018-08-094-38/+20
* | Merge pull request #6551 from vespa-engine/hakonhall/write-etchosts-in-node-a...Håkon Hallingstad2018-08-106-23/+131
|\ \
| * | Write /etc/hosts in node-adminHåkon Hallingstad2018-08-106-23/+131
* | | Merge pull request #6512 from vespa-engine/henrhoi/object-structured-groupingJon Bratseth2018-08-106-48/+36
|\ \ \
| * | | Removed creation of empty groupingRequest-list, and setGrouping()-funtionHenrik2018-08-102-14/+1
| * | | Removed test that no longer makes senseHenrik2018-08-102-14/+2
| * | | Added requested changesHenrik2018-08-103-13/+6
| * | | Removed typoHenrik2018-08-101-1/+1
| * | | Now adding GroupingStep List to Select, instead of as a query-propertyHenrik2018-08-085-7/+12
| * | | GroupingRequest.getRequests() now returning query.getSelect().getGrouping() a...Henrik2018-08-074-22/+15
| * | | Added a object structure for GroupingRequest objects, accessable from query.g...Henrik2018-08-074-14/+36
* | | | Merge pull request #6546 from vespa-engine/balder/fix-lifetime-issue-in-testHenning Baldersheim2018-08-101-60/+41
|\ \ \ \
| * | | | Ensure object lifetime is upheld.Henning Baldersheim2018-08-101-60/+41
|/ / / /
* | | | Merge pull request #6544 from vespa-engine/toregge/add-events-when-having-exc...Henning Baldersheim2018-08-104-21/+48
|\ \ \ \
| * | | | Log events to related to exclusive lock for stable enums:Tor Egge2018-08-104-21/+48
* | | | | Merge pull request #6535 from vespa-engine/balder/create-diversity-on-demandHenning Baldersheim2018-08-1010-118/+276
|\ \ \ \ \
| * | | | | Streamline parameter extraction.Henning Baldersheim2018-08-104-63/+61
| * | | | | No _ prefix for public members.Henning Baldersheim2018-08-103-35/+35
| * | | | | Separate test to be more clear what is being tested.Henning Baldersheim2018-08-101-4/+13
| * | | | | get_mtf -> create_mtfHenning Baldersheim2018-08-101-11/+11
| * | | | | Add a test for diversity after first phase.Henning Baldersheim2018-08-091-3/+91
| * | | | | Refactor param extraction.Henning Baldersheim2018-08-093-32/+47
| * | | | | Properly set cutoff strategy too.Henning Baldersheim2018-08-091-1/+2
| * | | | | Create diversity filter on demand if diversity is specified.Henning Baldersheim2018-08-097-67/+114
* | | | | | Rename (#6543)Jon Bratseth2018-08-1015-3/+3
* | | | | | Add handler skeleton (#6541)Jon Bratseth2018-08-103-1/+76
| |/ / / / |/| | | |
* | | | | Revert "Revert "Depend on model-inference"" (#6540)Jon Bratseth2018-08-101-0/+5
| |_|/ / |/| | |