summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 #7361 from vespa-engine/bjorncs/vespa-visit-fixBjørn Christian Seime2018-10-182-57/+79
|\
| * Print missing '[' for json when receiving no documentsBjørn Christian Seime2018-10-182-0/+15
| * Add copyrightBjørn Christian Seime2018-10-181-0/+1
| * Fix bug where ']' is printed when listing ids only with json enabledBjørn Christian Seime2018-10-182-6/+41
| * Make methods privateBjørn Christian Seime2018-10-181-3/+3
| * Add contructor intended for unit testingBjørn Christian Seime2018-10-181-3/+9
| * UTF-8 is always supported in JavaBjørn Christian Seime2018-10-181-8/+9
| * Add '@Override' to all methods that are overridenBjørn Christian Seime2018-10-181-0/+2
| * Remove dead codeBjørn Christian Seime2018-10-181-39/+1
* | Merge pull request #7364 from vespa-engine/revert-7342-freva/move-spec-verifi...Valerij Fredriksen2018-10-1824-310/+432
|\ \
| * | Revert "NodeAdmin: Remove usage for Environment"Valerij Fredriksen2018-10-1824-310/+432
|/ /
* | Merge pull request #7363 from vespa-engine/revert-7352-freva/cleanupValerij Fredriksen2018-10-1812-3/+1309
|\ \
| * | Revert "NodeAdmin: Remove unused stuff"Valerij Fredriksen2018-10-1812-3/+1309
|/ /
* | Merge pull request #7349 from vespa-engine/musum/limit-number-of-config-model...Jon Bratseth2018-10-188-117/+165
|\ \
| * | Test models used when deploying with new nodesHarald Musum2018-10-181-9/+34
| * | Rename methodHarald Musum2018-10-181-2/+2
| * | Only consider hosts with version set when deciding model versions to buildHarald Musum2018-10-182-27/+26
| * | Move test and use higher-level APIsHarald Musum2018-10-182-33/+49
| * | Simplify deploying app in testerHarald Musum2018-10-185-38/+42
| * | Simplify and add toString() to AllocatedHostsHarald Musum2018-10-172-12/+16
* | | Merge pull request #7358 from vespa-engine/hmusum/remove-unused-argument-2Valerij Fredriksen2018-10-183-23/+13
|\ \ \ | |_|/ |/| |
| * | Remove unused argument, simplifying loggingHarald Musum2018-10-183-23/+13
* | | Merge pull request #7341 from vespa-engine/mortent/expose-ztoken-expiryBjørn Christian Seime2018-10-181-0/+5
|\ \ \ | |/ / |/| |
| * | Expose role token expiryMorten Tokle2018-10-171-0/+5
* | | Merge pull request #7279 from vespa-engine/hmusum/allow-1-node-for-admin-clus...Jon Bratseth2018-10-183-12/+14
|\ \ \
| * \ \ Merge branch 'master' into hmusum/allow-1-node-for-admin-cluster-in-prodHarald Musum2018-10-18450-7782/+5976
| |\ \ \
| * | | | Allow only one node for admin clusters in prodHarald Musum2018-10-113-12/+12
* | | | | Merge pull request #7354 from vespa-engine/mpolden/controller-ssl-providerMartin Polden2018-10-186-0/+255
|\ \ \ \ \
| * | | | | Add SSL provider for configuring controller HTTPS connectorMartin Polden2018-10-186-0/+255
* | | | | | Merge pull request #7356 from vespa-engine/freva/ignore-throwable-in-node-agentValerij Fredriksen2018-10-181-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Ignore Throwable in NodeAgent tickValerij Fredriksen2018-10-181-2/+2
* | | | | | Merge pull request #7355 from vespa-engine/bratseth/propagate-validation-flag...Harald Musum2018-10-184-24/+15
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Only fail when we canJon Bratseth2018-10-181-5/+4
| * | | | | Nonfunctional changes onlyJon Bratseth2018-10-183-19/+11
* | | | | | Merge pull request #7352 from vespa-engine/freva/cleanupValerij Fredriksen2018-10-1812-1309/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Minor fixesValerij Fredriksen2018-10-182-2/+2
| * | | | | Remove EnvironmentValerij Fredriksen2018-10-181-318/+0
| * | | | | Remove FilebeatConfigProviderValerij Fredriksen2018-10-182-352/+0
| * | | | | Remove FileHelperValerij Fredriksen2018-10-182-501/+0
| * | | | | Remove PathResolverValerij Fredriksen2018-10-182-112/+0
| * | | | | Remove ConfigServerConfigValerij Fredriksen2018-10-183-24/+1
* | | | | | Merge pull request #7342 from vespa-engine/freva/move-spec-verifier-to-host-a...Valerij Fredriksen2018-10-1824-432/+310
|\| | | | |
| * | | | | zone() -> zoneId()Valerij Fredriksen2018-10-183-5/+5
| * | | | | Fix test mocksValerij Fredriksen2018-10-171-29/+13
| * | | | | Remove ClassLocking from NASUValerij Fredriksen2018-10-172-78/+37
| * | | | | Remove Environment from NodeAgent and AclMaintainerValerij Fredriksen2018-10-176-93/+48
| * | | | | Remove Environment and ProcessExecuter from StorageMaintainerValerij Fredriksen2018-10-174-38/+8