summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove instance dimension where it should not beJon Marius Venstad2019-10-0812-62/+70
* Merge pull request #10911 from vespa-engine/jvenstad/application-response-wit...Jon Marius Venstad2019-10-0830-382/+455
|\
| * Aggregate over instances in application responseJon Marius Venstad2019-10-0815-86/+284
| * List deployments in each instance, in application response modelJon Marius Venstad2019-10-082-14/+23
| * Update more test responsesJon Marius Venstad2019-10-086-162/+4
| * Use more latestVersion and update some testsJon Marius Venstad2019-10-087-52/+22
| * Use Application.latestVersion instead of last component job successJon Marius Venstad2019-10-086-47/+65
| * Store latest submission version explicitlyJon Marius Venstad2019-10-084-23/+59
* | Merge pull request #10906 from vespa-engine/ogronnesby/tenant-cost-apiØyvind Grønnesby2019-10-083-1/+64
|\ \
| * | Clean importsØyvind Grønnesby2019-10-081-2/+0
| * | Don't expose day in API as we don't really care about it hereØyvind Grønnesby2019-10-083-11/+13
| * | Rename tenantCostParseMonth -> tenantCostParseDateØyvind Grønnesby2019-10-081-2/+2
| * | Use IllegalArgumentException for bad date string and rename paramØyvind Grønnesby2019-10-081-17/+10
| * | Initial tenant cost API that is not wired up to any clients yetØyvind Grønnesby2019-10-073-1/+71
* | | Merge pull request #10885 from vespa-engine/ogronnesby/let-plugin-get-key-as-...Øyvind Grønnesby2019-10-082-4/+20
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/master' into ogronnesby/let-plugin-get-k...Øyvind Grønnesby2019-10-08126-1619/+3938
| |\ \ \
| * | | | Add "privateKey" to the Properties utility classØyvind Grønnesby2019-10-081-0/+4
| * | | | When the privateKey is set, assume we don't need the certificate parameterØyvind Grønnesby2019-10-081-9/+10
| * | | | Make test for key presence symmetricØyvind Grønnesby2019-10-041-1/+1
| * | | | Let plugin get the key as parameterØyvind Grønnesby2019-10-041-2/+12
* | | | | Merge pull request #10914 from vespa-engine/toregge/use-summary-executor-for-...Tor Egge2019-10-082-2/+3
|\ \ \ \ \
| * | | | | Use summary executor for compactLidSpace() on docstore.Tor Egge2019-10-082-2/+3
* | | | | | Merge pull request #10915 from vespa-engine/balder/let-us-not-expose-more-res...Bjørn Christian Seime2019-10-082-1/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | 2 threads should be plenty here.Henning Baldersheim2019-10-082-1/+3
* | | | | | Merge pull request #10912 from vespa-engine/bratseth/instances-in-deployment-...Jon Marius Venstad2019-10-0824-672/+2548
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Allow non-existing instances when appropriateJon Bratseth2019-10-088-211/+261
| * | | | | Revert "Merge pull request #10909 from vespa-engine/revert-10891-bratseth/ins...Jon Bratseth2019-10-0824-674/+2500
* | | | | | Merge pull request #10913 from vespa-engine/bjorncs/jdisc-access-loggingHenning Baldersheim2019-10-084-218/+30
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Replace 'Alternative' with 'Optional'Bjørn Christian Seime2019-10-083-208/+4
| * | | | | Use 'X-Forwarded-Port' as preferred source for remote portBjørn Christian Seime2019-10-082-1/+16
| * | | | | Always include peer port/address in access logBjørn Christian Seime2019-10-081-9/+10
|/ / / / /
* | | | | Merge pull request #10910 from vespa-engine/hakonhall/add-replaceexisting-for...Valerij Fredriksen2019-10-081-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add REPLACE_EXISTING for atomic movesHåkon Hallingstad2019-10-081-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #10901 from vespa-engine/mpolden/os-upgrade-failing-metricMartin Polden2019-10-0819-216/+399
|\ \ \ \ | |/ / / |/| | |
| * | | Update equals/hashCodeMartin Polden2019-10-072-4/+5
| * | | Remove unused methodMartin Polden2019-10-071-9/+0
| * | | Report metric for nodes failing OS upgradeMartin Polden2019-10-073-6/+113
| * | | Replace OsVersion.Node with NodeVersionMartin Polden2019-10-0711-177/+187
| * | | Stop reading legacy configServerHostnames fieldMartin Polden2019-10-074-30/+37
| * | | Add zone field to NodeVersionMartin Polden2019-10-075-9/+25
| * | | Extract NodeVersionSerializerMartin Polden2019-10-072-17/+68
* | | | Merge pull request #10908 from vespa-engine/hakonhall/support-atomic-writes-w...Håkon Hallingstad2019-10-083-8/+47
|\ \ \ \
| * | | | Support atomic writes with FileWriterHåkon Hallingstad2019-10-073-8/+47
| | |_|/ | |/| |
* | | | Merge pull request #10909 from vespa-engine/revert-10891-bratseth/instances-i...Jon Bratseth2019-10-0724-2500/+674
|\ \ \ \
| * | | | Revert "Bratseth/instances in deployment xml rebased"Jon Bratseth2019-10-0724-2500/+674
* | | | | Merge pull request #10899 from vespa-engine/bratseth/relative-substitutionJon Bratseth2019-10-0711-129/+325
|\ \ \ \ \
| * | | | | Validate local substitutions during compileJon Bratseth2019-10-074-33/+51
| * | | | | Support relative substitution by prefixing a property by dotJon Bratseth2019-10-079-101/+279
* | | | | | Merge pull request #10904 from vespa-engine/bratseth/allow-deployment-instancesJon Bratseth2019-10-073-12/+90
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Update config-model/src/main/resources/schema/deployment.rncJon Bratseth2019-10-071-1/+1