summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #7436 from vespa-engine/bjorncs/athenz-okta-tenancyMorten Tokle2018-10-2553-784/+952
|\
| * Remove unused parameters from athenz.defBjørn Christian Seime2018-10-241-29/+0
| * Create Athenz tenancy using OktaBjørn Christian Seime2018-10-2427-567/+344
| * Add ZmsClient and DefaultZmsClientBjørn Christian Seime2018-10-2411-0/+494
| * Create ClientBase containing common Athenz client logicBjørn Christian Seime2018-10-2413-84/+114
| * Remove UserAuthWithAthenzPrincipalFilterBjørn Christian Seime2018-10-181-104/+0
* | Merge pull request #7441 from vespa-engine/revert-7437-revert-7423-hmusum/rem...Harald Musum2018-10-253-25/+8
|\ \
| * | Revert "Revert "No need for restricting access to zookeeper in hosted vespa""Harald Musum2018-10-243-25/+8
|/ /
* | Merge pull request #7439 from vespa-engine/revert-7408-balder/send-in-own-threadHenning Baldersheim2018-10-242-10/+39
|\ \
| * | Revert "Balder/send in own thread"Henning Baldersheim2018-10-242-10/+39
|/ /
* | Merge pull request #7435 from vespa-engine/balder/stabilize-test-with-race-co...Henning Baldersheim2018-10-2412-103/+139
|\ \
| * | No wildcard import.Henning Baldersheim2018-10-241-2/+13
| * | GC unused fieldHenning Baldersheim2018-10-241-2/+0
| * | No wildcard import.Henning Baldersheim2018-10-241-4/+1
| * | No wildcard import.Henning Baldersheim2018-10-241-2/+15
| * | Must handle concurrent access.Henning Baldersheim2018-10-241-3/+14
| * | Move ThreadedFeedAccess out as independent class.Henning Baldersheim2018-10-243-79/+83
| * | GC unused imports + finalHenning Baldersheim2018-10-244-11/+13
* | | Merge pull request #7437 from vespa-engine/revert-7423-hmusum/remove-check-fo...Jon Bratseth2018-10-243-8/+25
|\ \ \
| * | | Revert "No need for restricting access to zookeeper in hosted vespa"Harald Musum2018-10-243-8/+25
|/ / /
* | | Merge pull request #7423 from vespa-engine/hmusum/remove-check-for-allowed-zk...Jon Bratseth2018-10-243-25/+8
|\ \ \
| * | | No need for restricting access to zookeeper in hosted vespaHarald Musum2018-10-233-25/+8
* | | | Merge pull request #7434 from vespa-engine/jvenstad/throw-and-catchJon Bratseth2018-10-243-11/+9
|\ \ \ \
| * | | | Catch the right exceptionJon Marius Venstad2018-10-243-11/+9
* | | | | Merge pull request #7420 from vespa-engine/lesters/dont-retrieve-search-api-d...gjoranv2018-10-242-0/+1917
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Add search api reference temporarily to avoid download during buildLester Solbakken2018-10-232-0/+1917
| | |/ / | |/| |
* | | | Merge pull request #7432 from vespa-engine/bratseth/add-new-url-to-bindingmat...Jon Bratseth2018-10-245-7/+25
|\ \ \ \ | |_|/ / |/| | |
| * | | Bind the suspended urlJon Bratseth2018-10-245-7/+25
* | | | 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