Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Catch the right exception | Jon Marius Venstad | 2018-10-24 | 3 | -11/+9 |
* | Use dynamic port (#7430) | Harald Musum | 2018-10-24 | 1 | -5/+5 |
* | Merge pull request #7431 from vespa-engine/musum/whitelist-zookeeper-four-let... | Valerij Fredriksen | 2018-10-24 | 2 | -1/+7 |
|\ | |||||
| * | Whitelist ZooKeeper four letter commands | Harald Musum | 2018-10-24 | 2 | -1/+7 |
* | | Merge pull request #7400 from vespa-engine/mpolden/remove-pr-instances | Martin Polden | 2018-10-24 | 4 | -0/+92 |
|\ \ | |||||
| * | | Remove PR instances | Martin Polden | 2018-10-22 | 4 | -0/+92 |
* | | | Merge pull request #7417 from vespa-engine/lesters/allow-array-map-struct-value | Lester Solbakken | 2018-10-24 | 2 | -38/+47 |
|\ \ \ | |||||
| * | | | Check that assumption of struct data type is correct | Lester Solbakken | 2018-10-23 | 2 | -38/+47 |
* | | | | Merge pull request #7429 from vespa-engine/balder/use-multiple-sender-threads | Henning Baldersheim | 2018-10-24 | 10 | -41/+135 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Hide the details in the ThreadedFeedAccess to avoid ifs on the outside. | Henning Baldersheim | 2018-10-24 | 3 | -19/+29 |
| * | | | Properly close tasks. | Henning Baldersheim | 2018-10-24 | 1 | -0/+6 |
| * | | | Add support for using more than 1 sender thread. | Henning Baldersheim | 2018-10-23 | 8 | -37/+115 |
* | | | | Merge pull request #7416 from vespa-engine/revert-7116-revert-7098-frodelu/co... | Jon Bratseth | 2018-10-23 | 5 | -8/+24 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Merge branch 'revert-7116-revert-7098-frodelu/combined-api-uris' of github.co... | Frode Lundgren | 2018-10-23 | 0 | -0/+0 |
| |\ \ \ | |||||
| | * | | | Revert "Revert "Adding getConfigServerApiUris() to include both cfg servers a... | Frode Lundgren | 2018-09-28 | 5 | -8/+24 |
| * | | | | Revert "Revert "Adding getConfigServerApiUris() to include both cfg servers a... | Frode Lundgren | 2018-10-23 | 5 | -8/+24 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #7403 from vespa-engine/bratseth/freeze-other-zones-while-... | Jon Bratseth | 2018-10-23 | 34 | -40/+349 |
|\ \ \ \ | |||||
| * \ \ \ | Merge with master | Jon Bratseth | 2018-10-23 | 70 | -1629/+463 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #7428 from vespa-engine/jvenstad/abort-running-deployment-... | Jon Bratseth | 2018-10-23 | 3 | -3/+75 |
|\ \ \ \ \ | |||||
| * | | | | | Abort internally run jobs whenever new application change is accepted | Jon Marius Venstad | 2018-10-23 | 3 | -3/+75 |
* | | | | | | Merge pull request #7395 from vespa-engine/mpolden/remove-prepare | Harald Musum | 2018-10-23 | 2 | -8/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove deprecated prepare | Martin Polden | 2018-10-22 | 1 | -5/+0 |
| * | | | | | | Update javadoc | Martin Polden | 2018-10-22 | 1 | -3/+6 |
* | | | | | | | Merge pull request #7422 from vespa-engine/freva/include-zookeeper-config | Harald Musum | 2018-10-23 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Include zookeeper-server-config.xml | Valerij Fredriksen | 2018-10-23 | 1 | -0/+2 |
* | | | | | | | | Merge pull request #7427 from vespa-engine/jvenstad/abort-running-deployment-... | Jon Bratseth | 2018-10-23 | 4 | -9/+30 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | Allow admins and operators to cancel hosted deployment jobs | Jon Marius Venstad | 2018-10-23 | 4 | -9/+30 |
* | | | | | | | | Merge pull request #7392 from vespa-engine/revert-7363-revert-7352-freva/cleanup | Valerij Fredriksen | 2018-10-23 | 12 | -1306/+2 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Do not change config server order | Valerij Fredriksen | 2018-10-22 | 1 | -1/+3 |
| * | | | | | | | Revert "Revert "NodeAdmin: Remove unused stuff"" | Valerij Fredriksen | 2018-10-22 | 12 | -1309/+3 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #7419 from vespa-engine/jvenstad/more-deployment-informati... | Jon Marius Venstad | 2018-10-23 | 16 | -28/+39 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Expose whether an application is deployed internally | Jon Marius Venstad | 2018-10-23 | 11 | -11/+16 |
| * | | | | | | | Accept optional project id for new pipeline submissions | Jon Marius Venstad | 2018-10-23 | 8 | -17/+23 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #7414 from vespa-engine/olaaun/remove-datatypeconverter | gjoranv | 2018-10-23 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Convert to base 64 using standard library | Ola Aunrønning | 2018-10-23 | 1 | -2/+2 |
* | | | | | | | | Merge pull request #7412 from vespa-engine/freva/get-child-nodetype-from-parent | Valerij Fredriksen | 2018-10-23 | 2 | -19/+29 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Check against node NodeType | Valerij Fredriksen | 2018-10-23 | 1 | -7/+7 |
| * | | | | | | | | Add a method to get child type from host | Valerij Fredriksen | 2018-10-23 | 1 | -12/+22 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #7408 from vespa-engine/balder/send-in-own-thread | Henning Baldersheim | 2018-10-23 | 2 | -39/+10 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Do not remove public methods. | Henning Baldersheim | 2018-10-23 | 1 | -1/+9 |
| * | | | | | | | Remove redundant code. | Henning Baldersheim | 2018-10-22 | 1 | -14/+6 |
| * | | | | | | | Just send in own thread. | Henning Baldersheim | 2018-10-22 | 1 | -34/+5 |
* | | | | | | | | Merge pull request #7415 from vespa-engine/bratseth/allow-conflicting-aliases | Jon Bratseth | 2018-10-23 | 2 | -26/+28 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Allow conflicting aliases across document types | Jon Bratseth | 2018-10-23 | 2 | -26/+28 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #7411 from vespa-engine/lesters/revert-revert-disallow-com... | Arnstein Ressem | 2018-10-23 | 9 | -33/+106 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Revert "Revert "Disallow complex types as keys for nested types in arrays"" | Lester Solbakken | 2018-10-23 | 9 | -33/+106 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #7410 from vespa-engine/revert-7399-lesters/disallow-compl... | Arnstein Ressem | 2018-10-23 | 9 | -106/+33 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Revert "Disallow complex types as keys for nested types in arrays" | Harald Musum | 2018-10-23 | 9 | -106/+33 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #7409 from vespa-engine/revert-7380-bratseth/segment-yql-b... | Jon Bratseth | 2018-10-23 | 6 | -85/+306 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Revert "Bratseth/segment yql by default" | Harald Musum | 2018-10-22 | 6 | -85/+306 |
|/ / / / / / |