aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #6427 from vespa-engine/arnej/avoid-fork-to-killHenning Baldersheim2018-07-195-6/+6
|\ \ \ \ \ \
| * | | | | | just exit on out of memoryArne Juul2018-07-185-6/+6
| |/ / / / /
* | | | | | Merge pull request #6407 from jefimm/masterJon Bratseth2018-07-197-0/+400
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | add opennlp stemmers - revert previous changesJefim Matskin2018-07-1810-139/+392
| * | | | | fix guava versionJefim Matskin2018-07-171-1/+1
| * | | | | fix typoJefim Matskin2018-07-171-1/+1
| * | | | | add lang detection and opennlp stemmers - fix missing dependenciesJefim Matskin2018-07-171-1/+5
| * | | | | add lang detection and opennlp stemmers - fix missing dependenciesJefim Matskin2018-07-171-0/+8
| * | | | | add lang detection and opennlp stemmersJefim Matskin2018-07-171-3/+7
| * | | | | add lang detection and opennlp stemmersJefim Matskin2018-07-171-3/+2
| * | | | | add lang detection and opennlp stemmersJefim Matskin2018-07-176-6/+138
* | | | | | Merge pull request #6426 from vespa-engine/balder/fix-incorrect-testGeir Storli2018-07-191-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | Actually test what you claimHenning Baldersheim2018-07-191-2/+2
* | | | | Merge pull request #6419 from vespa-engine/henrhoi/rank-profiles-and-sources-...Jon Bratseth2018-07-198-119/+190
|\ \ \ \ \
| * | | | | Added a provided dependency on configdefinition for RankProfileConfigHenrik2018-07-181-0/+6
| * | | | | Forgot to add one change from the reverted PR. Now added for index.htmlHenrik2018-07-181-102/+50
| * | | | | Solved conflict and added all changes from the PR that was revertedHenrik2018-07-1871-497/+989
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Changed artifactId in pom.xml. Had to get the bundle container-search-and-doc...Henrik2018-07-182-13/+30
* | | | | | Merge pull request #6411 from vespa-engine/henrhoi/get-search-reference-api-o...Jon Bratseth2018-07-193-1013/+20
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Removed ignore, now that the search api reference gets placed in /targetHenrik2018-07-181-2/+1
| * | | | | Download html file in prepare-package to the target directory.gjoranv2018-07-181-3/+3
| * | | | | Changed phase of getting the resourceHenrik2018-07-171-1/+1
| * | | | | Maven now gets the search api reference from the docs.vespa.ai when building ...Henrik2018-07-173-1011/+19
* | | | | | Merge pull request #6425 from vespa-engine/hmusum/initial-wait-in-periodic-ap...Henning Baldersheim2018-07-192-0/+13
|\ \ \ \ \ \
| * | | | | | Add initial wait in periodic application maintainerHarald Musum2018-07-192-0/+13
|/ / / / / /
* | | | | | Merge pull request #6424 from vespa-engine/gjoranv/upgrade-apache-httpclientHarald Musum2018-07-194-11/+8
|\ \ \ \ \ \
| * | | | | | Inherit apache httpcomponents version from parent.gjoranv2018-07-181-6/+0
| * | | | | | Use apache.httpcomponents 4.4.1gjoranv2018-07-182-4/+6
| * | | | | | Upgrade apache httpclient to 4.4.gjoranv2018-07-182-3/+4
* | | | | | | Merge pull request #6400 from vespa-engine/hmusum/use-configserver-spec-for-c...Harald Musum2018-07-183-32/+23
|\ \ \ \ \ \ \
| * | | | | | | FixHarald Musum2018-07-181-1/+1
| * | | | | | | Use config server spec for config server rpc portHarald Musum2018-07-173-32/+23
* | | | | | | | Merge pull request #6413 from vespa-engine/balder/prevent-large-adjustmentsHenning Baldersheim2018-07-184-15/+89
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Extend test and fix typos.Henning Baldersheim2018-07-182-5/+27
| * | | | | | | - std::make_xxxHenning Baldersheim2018-07-172-11/+12
| * | | | | | | Prevent changes above 10%Henning Baldersheim2018-07-172-0/+12
| * | | | | | | Prevent division by zero and large relative changes on very small numbers.Henning Baldersheim2018-07-172-4/+43
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #6421 from vespa-engine/balder/compute-bloat-after-flushGeir Storli2018-07-181-3/+5
|\ \ \ \ \ \ \
| * | | | | | | Compute bloat after when it is more accurate.Henning Baldersheim2018-07-181-3/+5
|/ / / / / / /
* | | | | | | Merge pull request #6420 from vespa-engine/hmusum/filter-out-apps-that-should...Harald Musum2018-07-182-16/+11
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Filter out apps that should not be deployed on this config serverHarald Musum2018-07-182-16/+11
|/ / / / / /
* | | | | | Merge pull request #6418 from vespa-engine/hmusum/do-no-try-to-redeploy-confi...Valerij Fredriksen2018-07-181-0/+16
|\ \ \ \ \ \
| * | | | | | Exclude fake appsHarald Musum2018-07-181-1/+13
| * | | | | | Do not try to redeploy config server appHarald Musum2018-07-181-0/+4
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #6415 from vespa-engine/aressem/single-threaded-plugin-com...Arnstein Ressem2018-07-181-5/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Maven install plugin fails when multiple maven plugins are installed in the s...Arnstein Ressem2018-07-181-5/+5
* | | | | | Merge pull request #6417 from vespa-engine/revert-6410-henrhoi/rank-profiles-...Harald Musum2018-07-188-182/+49
|\ \ \ \ \ \
| * | | | | | Revert "henrhoi/rank-profiles-and-sources-in-configuration-file"Harald Musum2018-07-188-182/+49
|/ / / / / /
* | | | | | Merge pull request #6416 from vespa-engine/hmusum/add-loggingHarald Musum2018-07-182-5/+9
|\ \ \ \ \ \
| * | | | | | Add some loggingHarald Musum2018-07-182-5/+9
|/ / / / / /