Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make antlr and antlr4 invisible for customer projects. | gjoranv | 2017-09-01 | 4 | -4/+44 |
| | | | | - Visible only in test classpath. | ||||
* | Merge pull request #3309 from ↵ | Henning Baldersheim | 2017-09-01 | 11 | -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 ranking | Håvard Pettersen | 2017-09-01 | 11 | -20/+28 |
| | | |||||
* | | Merge pull request #3299 from ↵ | Håvard Pettersen | 2017-09-01 | 3 | -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 Baldersheim | 2017-09-01 | 3 | -7/+3 |
| | | | |||||
* | | | Merge pull request #3308 from ↵ | Jon Bratseth | 2017-09-01 | 5 | -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" | gjoranv | 2017-09-01 | 5 | -44/+15 |
| | | | | |||||
* | | | | Merge pull request #3300 from ↵ | Henning Baldersheim | 2017-09-01 | 4 | -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 Baldersheim | 2017-09-01 | 1 | -0/+6 |
| | | | | |||||
| * | | | I guess the 'fast-search' hint is better than the 'filter' hint. | Henning Baldersheim | 2017-09-01 | 1 | -1/+1 |
| | | | | |||||
| * | | | Make posting lists if it is strict or if target is filter. | Henning Baldersheim | 2017-09-01 | 4 | -37/+31 |
| |/ / | | | | | | | | | | If it is filter we build bitvector instead of posting list. | ||||
* | | | Merge pull request #3307 from vespa-engine/gjoranv/revert-rewrite-to-java | gjoranv | 2017-09-01 | 7 | -58/+33 |
|\ \ \ | | | | | | | | | Revert "Rewrite ConfigGenerator.createClassName to Java." | ||||
| * | | | Revert "Rewrite ConfigGenerator.createClassName to Java." | gjoranv | 2017-09-01 | 7 | -58/+33 |
|/ / / | | | | | | | | | | This reverts commit f6ec274aab8d1b4d2ac25c104bc5a603dc4156ff. | ||||
* | | | Merge pull request #3305 from vespa-engine/gjoranv/revert-exclude-scala-xml | gjoranv | 2017-09-01 | 5 | -26/+0 |
|\ \ \ | | | | | | | | | Revert "Exclude scala-xml from provided classpath" | ||||
| * | | | Revert "Exclude scala-xml from provided classpath" | gjoranv | 2017-09-01 | 5 | -26/+0 |
|/ / / | | | | | | | | | | This reverts commit 2bcc584022f761efa9968a3c126608b559b8fedb. | ||||
* | | | Merge pull request #3304 from ↵ | gjoranv | 2017-09-01 | 1 | -17/+2 |
|\ \ \ | |_|/ |/| | | | | | | | | vespa-engine/revert-3298-gjoranv/reintroduce-removed-method Revert "Put back removed ConfigGenerator.createClassName." | ||||
| * | | Revert "Put back removed ConfigGenerator.createClassName." | gjoranv | 2017-09-01 | 1 | -17/+2 |
|/ / | |||||
* | | Merge pull request #3302 from vespa-engine/bjorncs/remove-netty | Bjørn Christian Seime | 2017-09-01 | 6 | -66/+112 |
|\ \ | | | | | | | Bjorncs/remove netty | ||||
| * | | Store maxage as seconds | Bjørn Christian Seime | 2017-09-01 | 1 | -10/+8 |
| | | | |||||
| * | | Remove Netty by replacing cookie codec with Jetty + Java SE | Bjørn Christian Seime | 2017-09-01 | 6 | -60/+108 |
|/ / | |||||
* | | Merge pull request #3301 from vespa-engine/aressem/avoid-recursive-link | Lester Solbakken | 2017-09-01 | 1 | -7/+7 |
|\ \ | |/ |/| | Avoid recursive link in components when re-running make install. | ||||
| * | Avoid recursive link in components when re-running make install. | Arnstein Ressem | 2017-09-01 | 1 | -7/+7 |
| | | |||||
* | | Merge pull request #3298 from vespa-engine/gjoranv/reintroduce-removed-method | gjoranv | 2017-08-31 | 1 | -2/+17 |
|\ \ | | | | | | | Put back removed ConfigGenerator.createClassName. | ||||
| * | | Put back removed ConfigGenerator.createClassName. | gjoranv | 2017-08-31 | 1 | -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 Bratseth | 2017-08-31 | 5 | -15/+44 |
|\ \ | | | | | | | | | | | | | vespa-engine/hmusum/use-409-response-code-for-failing-activation Return 409 if there is a conflict when activating | ||||
| * | | Rename exception | Harald Musum | 2017-08-31 | 3 | -7/+7 |
| | | | |||||
| * | | Return 409 if there is a conflict when activating | Harald Musum | 2017-07-10 | 5 | -15/+44 |
| | | | |||||
* | | | Merge pull request #3286 from vespa-engine/gjoranv/exclude-scala-xml | Bjørn Christian Seime | 2017-08-31 | 12 | -33/+84 |
|\ \ \ | | | | | | | | | Exclude scala-xml to prevent import-package for its packages. | ||||
| * \ \ | Merge branch 'master' into gjoranv/exclude-scala-xml | gjoranv | 2017-08-31 | 410 | -2142/+4325 |
| |\ \ \ | |||||
| * | | | | Exclude scala-xml from provided classpath | gjoranv | 2017-08-31 | 5 | -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. | gjoranv | 2017-08-31 | 7 | -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/travis | gjoranv | 2017-08-31 | 2 | -1/+12 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Show log output during build | ||||
| * | | | | Show log output during build | Bjørn Christian Seime | 2017-08-31 | 2 | -1/+12 |
| | | | | | | | | | | | | | | | | | | | | Stop using travis_wait as it hides log output during build | ||||
* | | | | | Merge pull request #3283 from ↵ | Martin Polden | 2017-08-31 | 12 | -226/+422 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/mpolden/trigger-deployments-in-parallel Parallel deployments | ||||
| * | | | | | Ensure all parallel deployments complete before next step | Martin Polden | 2017-08-31 | 4 | -16/+42 |
| | | | | | | |||||
| * | | | | | Handle jobs that complete out of order | Martin Polden | 2017-08-31 | 3 | -2/+40 |
| | | | | | | |||||
| * | | | | | Fix test | Martin Polden | 2017-08-31 | 2 | -16/+23 |
| | | | | | | |||||
| * | | | | | Move zones() up to simplify | Jon Marius Venstad | 2017-08-31 | 2 | -27/+20 |
| | | | | | | |||||
| * | | | | | Trigger parallel deployments | Martin Polden | 2017-08-31 | 11 | -169/+260 |
| | | | | | | |||||
| * | | | | | Restore indentation | Martin Polden | 2017-08-31 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Extract DeploymentOrder class | Martin Polden | 2017-08-31 | 2 | -70/+111 |
| | | | | | | |||||
* | | | | | | Merge pull request #3294 from ↵ | Martin Polden | 2017-08-31 | 2 | -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 WARNING | Jon Marius Venstad | 2017-08-31 | 2 | -9/+4 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #3292 from vespa-engine/bjorncs/readme | Geir Storli | 2017-08-31 | 1 | -1/+2 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Improve doc on building Java | ||||
| * | | | | | | | Improve doc on building Java | Bjørn Christian Seime | 2017-08-31 | 1 | -1/+2 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #3293 from vespa-engine/bjorncs/bootstrap | Bjørn Christian Seime | 2017-08-31 | 2 | -2/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Reduce verbose output from bootstrap script. | ||||
| * | | | | | | Upgrade plugin to reduce log spam | Bjørn Christian Seime | 2017-08-31 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Reduce verbose output from bootstrap script. | Bjørn Christian Seime | 2017-08-31 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #3290 from vespa-engine/bjorncs/travis | Bjørn Christian Seime | 2017-08-31 | 1 | -0/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Don't cache repository.xml | ||||
| * | | | | | | Don't cache repository.xml | Bjørn Christian Seime | 2017-08-31 | 1 | -0/+1 |
|/ / / / / / |