summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make antlr and antlr4 invisible for customer projects.gjoranv2017-09-014-4/+44
| | | | - Visible only in test classpath.
* Merge pull request #3309 from ↵Henning Baldersheim2017-09-0111-20/+28
|\ | | | | | | | | vespa-engine/havardpe/use-zero-rank-score-for-unranked-results use 0.0 rank score for results when not ranking
| * use 0.0 rank score for results when not rankingHåvard Pettersen2017-09-0111-20/+28
| |
* | Merge pull request #3299 from ↵Håvard Pettersen2017-09-013-7/+3
|\ \ | | | | | | | | | | | | vespa-engine/revert-3285-arnej/render-inf-relevance-as-0 Revert "render infinite or NaN relevance as "0.0""
| * | Revert "render infinite or NaN relevance as "0.0""Henning Baldersheim2017-09-013-7/+3
| | |
* | | Merge pull request #3308 from ↵Jon Bratseth2017-09-015-44/+15
|\ \ \ | | | | | | | | | | | | | | | | vespa-engine/revert-2934-hmusum/use-409-response-code-for-failing-activation Revert "Return 409 if there is a conflict when activating"
| * | | Revert "Return 409 if there is a conflict when activating"gjoranv2017-09-015-44/+15
| | | |
* | | | Merge pull request #3300 from ↵Henning Baldersheim2017-09-014-37/+37
|\ \ \ \ | |/ / / |/| | | | | | | | | | | vespa-engine/balder/allow-for-efficient-bit-vector-with-imported-fields-too Balder/allow for efficient bit vector with imported fields too
| * | | Ensure large method is not inlined.Henning Baldersheim2017-09-011-0/+6
| | | |
| * | | I guess the 'fast-search' hint is better than the 'filter' hint.Henning Baldersheim2017-09-011-1/+1
| | | |
| * | | Make posting lists if it is strict or if target is filter.Henning Baldersheim2017-09-014-37/+31
| |/ / | | | | | | | | | If it is filter we build bitvector instead of posting list.
* | | Merge pull request #3307 from vespa-engine/gjoranv/revert-rewrite-to-javagjoranv2017-09-017-58/+33
|\ \ \ | | | | | | | | Revert "Rewrite ConfigGenerator.createClassName to Java."
| * | | Revert "Rewrite ConfigGenerator.createClassName to Java."gjoranv2017-09-017-58/+33
|/ / / | | | | | | | | | This reverts commit f6ec274aab8d1b4d2ac25c104bc5a603dc4156ff.
* | | Merge pull request #3305 from vespa-engine/gjoranv/revert-exclude-scala-xmlgjoranv2017-09-015-26/+0
|\ \ \ | | | | | | | | Revert "Exclude scala-xml from provided classpath"
| * | | Revert "Exclude scala-xml from provided classpath"gjoranv2017-09-015-26/+0
|/ / / | | | | | | | | | This reverts commit 2bcc584022f761efa9968a3c126608b559b8fedb.
* | | Merge pull request #3304 from ↵gjoranv2017-09-011-17/+2
|\ \ \ | |_|/ |/| | | | | | | | vespa-engine/revert-3298-gjoranv/reintroduce-removed-method Revert "Put back removed ConfigGenerator.createClassName."
| * | Revert "Put back removed ConfigGenerator.createClassName."gjoranv2017-09-011-17/+2
|/ /
* | Merge pull request #3302 from vespa-engine/bjorncs/remove-nettyBjørn Christian Seime2017-09-016-66/+112
|\ \ | | | | | | Bjorncs/remove netty
| * | Store maxage as secondsBjørn Christian Seime2017-09-011-10/+8
| | |
| * | Remove Netty by replacing cookie codec with Jetty + Java SEBjørn Christian Seime2017-09-016-60/+108
|/ /
* | Merge pull request #3301 from vespa-engine/aressem/avoid-recursive-linkLester Solbakken2017-09-011-7/+7
|\ \ | |/ |/| Avoid recursive link in components when re-running make install.
| * Avoid recursive link in components when re-running make install.Arnstein Ressem2017-09-011-7/+7
| |
* | Merge pull request #3298 from vespa-engine/gjoranv/reintroduce-removed-methodgjoranv2017-08-311-2/+17
|\ \ | | | | | | Put back removed ConfigGenerator.createClassName.
| * | Put back removed ConfigGenerator.createClassName.gjoranv2017-08-311-2/+17
|/ / | | | | | | | | - It will still be used for a while by older config models. (By classes InstanceResolver and VespaModel.)
* | Merge pull request #2934 from ↵Jon Bratseth2017-08-315-15/+44
|\ \ | | | | | | | | | | | | vespa-engine/hmusum/use-409-response-code-for-failing-activation Return 409 if there is a conflict when activating
| * | Rename exceptionHarald Musum2017-08-313-7/+7
| | |
| * | Return 409 if there is a conflict when activatingHarald Musum2017-07-105-15/+44
| | |
* | | Merge pull request #3286 from vespa-engine/gjoranv/exclude-scala-xmlBjørn Christian Seime2017-08-3112-33/+84
|\ \ \ | | | | | | | | Exclude scala-xml to prevent import-package for its packages.
| * \ \ Merge branch 'master' into gjoranv/exclude-scala-xmlgjoranv2017-08-31410-2142/+4325
| |\ \ \
| * | | | Exclude scala-xml from provided classpathgjoranv2017-08-315-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - To prevent import-package for its packages. - scala-xml is only used to generate config classes, and is not needed or provided runtime. - Add scala-xml in scope test where it's used in unit tests.
| * | | | Rewrite ConfigGenerator.createClassName to Java.gjoranv2017-08-317-33/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - In new class ConfiggenUtil. - This allows using the function without loading classes from scala-xml.
* | | | | Merge pull request #3291 from vespa-engine/bjorncs/travisgjoranv2017-08-312-1/+12
|\ \ \ \ \ | |_|/ / / |/| | | | Show log output during build
| * | | | Show log output during buildBjørn Christian Seime2017-08-312-1/+12
| | | | | | | | | | | | | | | | | | | | Stop using travis_wait as it hides log output during build
* | | | | Merge pull request #3283 from ↵Martin Polden2017-08-3112-226/+422
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/mpolden/trigger-deployments-in-parallel Parallel deployments
| * | | | | Ensure all parallel deployments complete before next stepMartin Polden2017-08-314-16/+42
| | | | | |
| * | | | | Handle jobs that complete out of orderMartin Polden2017-08-313-2/+40
| | | | | |
| * | | | | Fix testMartin Polden2017-08-312-16/+23
| | | | | |
| * | | | | Move zones() up to simplifyJon Marius Venstad2017-08-312-27/+20
| | | | | |
| * | | | | Trigger parallel deploymentsMartin Polden2017-08-3111-169/+260
| | | | | |
| * | | | | Restore indentationMartin Polden2017-08-311-2/+2
| | | | | |
| * | | | | Extract DeploymentOrder classMartin Polden2017-08-312-70/+111
| | | | | |
* | | | | | Merge pull request #3294 from ↵Martin Polden2017-08-312-9/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/jvenstad/remove-unused-code-and-get-message-to-mojo Remove unused code and set the right field with WARNING
| * | | | | | Remove unused code and set the right field with WARNINGJon Marius Venstad2017-08-312-9/+4
| | | | | | |
* | | | | | | Merge pull request #3292 from vespa-engine/bjorncs/readmeGeir Storli2017-08-311-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Improve doc on building Java
| * | | | | | | Improve doc on building JavaBjørn Christian Seime2017-08-311-1/+2
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #3293 from vespa-engine/bjorncs/bootstrapBjørn Christian Seime2017-08-312-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Reduce verbose output from bootstrap script.
| * | | | | | Upgrade plugin to reduce log spamBjørn Christian Seime2017-08-311-1/+1
| | | | | | |
| * | | | | | Reduce verbose output from bootstrap script.Bjørn Christian Seime2017-08-311-1/+1
|/ / / / / /
* | | | | | Merge pull request #3290 from vespa-engine/bjorncs/travisBjørn Christian Seime2017-08-311-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Don't cache repository.xml
| * | | | | | Don't cache repository.xmlBjørn Christian Seime2017-08-311-0/+1
|/ / / / / /