summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Pass stringref by valueHenning Baldersheim2018-08-1083-205/+192
* Pass stringref by valueHenning Baldersheim2018-08-1037-190/+190
* 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
| |_|/ |/| |
* | | Merge pull request #6539 from vespa-engine/revert-6538-revert-6536-bjorncs/jettyHenning Baldersheim2018-08-101-1/+1
|\ \ \
| * | | Revert "Revert "Upgrade Jetty to version 9.4.11""Henning Baldersheim2018-08-101-1/+1
|/ / /
* | | Merge pull request #6534 from vespa-engine/freva/do-not-orchestrate-host-when...Valerij Fredriksen2018-08-109-33/+90
|\ \ \
| * | | Only orchestrate host if it's activeValerij Fredriksen2018-08-092-10/+50
| * | | Add parent host by default in DockerTesterValerij Fredriksen2018-08-092-1/+14
| * | | Fix NodeRepoMock to only return childrenValerij Fredriksen2018-08-097-22/+26
* | | | Merge pull request #6538 from vespa-engine/revert-6536-bjorncs/jettyHenning Baldersheim2018-08-101-1/+1
|\ \ \ \
| * | | | Revert "Upgrade Jetty to version 9.4.11"Henning Baldersheim2018-08-101-1/+1
|/ / / /
* | | | Merge pull request #6537 from vespa-engine/revert-6531-bratseth/include-model...Henning Baldersheim2018-08-091-5/+0
|\ \ \ \
| * | | | Revert "Depend on model-inference"Henning Baldersheim2018-08-091-5/+0
|/ / / /
* | | | Merge pull request #6536 from vespa-engine/bjorncs/jettyHenning Baldersheim2018-08-091-1/+1
|\ \ \ \
| * | | | Upgrade Jetty to version 9.4.11Bjørn Christian Seime2018-08-091-1/+1
| |/ / /
* | | | Merge pull request #6531 from vespa-engine/bratseth/include-model-inferenceLester Solbakken2018-08-091-0/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | Depend on model-inferenceJon Bratseth2018-08-091-0/+5
* | | | Merge pull request #6533 from vespa-engine/mpolden/prepare-os-versionMartin Polden2018-08-0923-117/+86
|\ \ \ \
| * | | | Remove unused version fields from nodes APIMartin Polden2018-08-095-13/+2
| * | | | Get JobControl from testerMartin Polden2018-08-092-1/+5
| * | | | Clean up signaturesMartin Polden2018-08-093-5/+5
| * | | | Fix TODOMartin Polden2018-08-091-3/+1
| * | | | Fix javadocMartin Polden2018-08-091-3/+3
| * | | | Make serializer for node type versions reusableMartin Polden2018-08-094-49/+51
| * | | | Clean up filter packageMartin Polden2018-08-096-20/+6