summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Catch the right exceptionJon Marius Venstad2018-10-243-11/+9
* Use dynamic port (#7430)Harald Musum2018-10-241-5/+5
* Merge pull request #7431 from vespa-engine/musum/whitelist-zookeeper-four-let...Valerij Fredriksen2018-10-242-1/+7
|\
| * Whitelist ZooKeeper four letter commandsHarald Musum2018-10-242-1/+7
* | Merge pull request #7400 from vespa-engine/mpolden/remove-pr-instancesMartin Polden2018-10-244-0/+92
|\ \
| * | Remove PR instancesMartin Polden2018-10-224-0/+92
* | | Merge pull request #7417 from vespa-engine/lesters/allow-array-map-struct-valueLester Solbakken2018-10-242-38/+47
|\ \ \
| * | | Check that assumption of struct data type is correctLester Solbakken2018-10-232-38/+47
* | | | Merge pull request #7429 from vespa-engine/balder/use-multiple-sender-threadsHenning Baldersheim2018-10-2410-41/+135
|\ \ \ \ | |_|_|/ |/| | |
| * | | Hide the details in the ThreadedFeedAccess to avoid ifs on the outside.Henning Baldersheim2018-10-243-19/+29
| * | | Properly close tasks.Henning Baldersheim2018-10-241-0/+6
| * | | Add support for using more than 1 sender thread.Henning Baldersheim2018-10-238-37/+115
* | | | Merge pull request #7416 from vespa-engine/revert-7116-revert-7098-frodelu/co...Jon Bratseth2018-10-235-8/+24
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'revert-7116-revert-7098-frodelu/combined-api-uris' of github.co...Frode Lundgren2018-10-230-0/+0
| |\ \ \
| | * | | Revert "Revert "Adding getConfigServerApiUris() to include both cfg servers a...Frode Lundgren2018-09-285-8/+24
| * | | | Revert "Revert "Adding getConfigServerApiUris() to include both cfg servers a...Frode Lundgren2018-10-235-8/+24
| | |/ / | |/| |
* | | | Merge pull request #7403 from vespa-engine/bratseth/freeze-other-zones-while-...Jon Bratseth2018-10-2334-40/+349
|\ \ \ \
| * \ \ \ Merge with masterJon Bratseth2018-10-2370-1629/+463
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #7428 from vespa-engine/jvenstad/abort-running-deployment-...Jon Bratseth2018-10-233-3/+75
|\ \ \ \ \
| * | | | | Abort internally run jobs whenever new application change is acceptedJon Marius Venstad2018-10-233-3/+75
* | | | | | Merge pull request #7395 from vespa-engine/mpolden/remove-prepareHarald Musum2018-10-232-8/+6
|\ \ \ \ \ \
| * | | | | | Remove deprecated prepareMartin Polden2018-10-221-5/+0
| * | | | | | Update javadocMartin Polden2018-10-221-3/+6
* | | | | | | Merge pull request #7422 from vespa-engine/freva/include-zookeeper-configHarald Musum2018-10-231-0/+2
|\ \ \ \ \ \ \
| * | | | | | | Include zookeeper-server-config.xmlValerij Fredriksen2018-10-231-0/+2
* | | | | | | | Merge pull request #7427 from vespa-engine/jvenstad/abort-running-deployment-...Jon Bratseth2018-10-234-9/+30
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Allow admins and operators to cancel hosted deployment jobsJon Marius Venstad2018-10-234-9/+30
* | | | | | | | Merge pull request #7392 from vespa-engine/revert-7363-revert-7352-freva/cleanupValerij Fredriksen2018-10-2312-1306/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Do not change config server orderValerij Fredriksen2018-10-221-1/+3
| * | | | | | | Revert "Revert "NodeAdmin: Remove unused stuff""Valerij Fredriksen2018-10-2212-1309/+3
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #7419 from vespa-engine/jvenstad/more-deployment-informati...Jon Marius Venstad2018-10-2316-28/+39
|\ \ \ \ \ \ \
| * | | | | | | Expose whether an application is deployed internallyJon Marius Venstad2018-10-2311-11/+16
| * | | | | | | Accept optional project id for new pipeline submissionsJon Marius Venstad2018-10-238-17/+23
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #7414 from vespa-engine/olaaun/remove-datatypeconvertergjoranv2018-10-231-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Convert to base 64 using standard libraryOla Aunrønning2018-10-231-2/+2
* | | | | | | | Merge pull request #7412 from vespa-engine/freva/get-child-nodetype-from-parentValerij Fredriksen2018-10-232-19/+29
|\ \ \ \ \ \ \ \
| * | | | | | | | Check against node NodeTypeValerij Fredriksen2018-10-231-7/+7
| * | | | | | | | Add a method to get child type from hostValerij Fredriksen2018-10-231-12/+22
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #7408 from vespa-engine/balder/send-in-own-threadHenning Baldersheim2018-10-232-39/+10
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Do not remove public methods.Henning Baldersheim2018-10-231-1/+9
| * | | | | | | Remove redundant code.Henning Baldersheim2018-10-221-14/+6
| * | | | | | | Just send in own thread.Henning Baldersheim2018-10-221-34/+5
* | | | | | | | Merge pull request #7415 from vespa-engine/bratseth/allow-conflicting-aliasesJon Bratseth2018-10-232-26/+28
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Allow conflicting aliases across document typesJon Bratseth2018-10-232-26/+28
|/ / / / / / /
* | | | | | | Merge pull request #7411 from vespa-engine/lesters/revert-revert-disallow-com...Arnstein Ressem2018-10-239-33/+106
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Revert "Revert "Disallow complex types as keys for nested types in arrays""Lester Solbakken2018-10-239-33/+106
|/ / / / / /
* | | | | | Merge pull request #7410 from vespa-engine/revert-7399-lesters/disallow-compl...Arnstein Ressem2018-10-239-106/+33
|\ \ \ \ \ \
| * | | | | | Revert "Disallow complex types as keys for nested types in arrays"Harald Musum2018-10-239-106/+33
|/ / / / / /
* | | | | | Merge pull request #7409 from vespa-engine/revert-7380-bratseth/segment-yql-b...Jon Bratseth2018-10-236-85/+306
|\ \ \ \ \ \
| * | | | | | Revert "Bratseth/segment yql by default"Harald Musum2018-10-226-85/+306
|/ / / / / /