aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [6.219.12-1].vespa-6.219.12-1by-screwdriver2018-03-124-1/+2
| | | | | | Created by command: /usr/bin/tito tag --use-version=6.219.12 --no-auto-changelog
* Merge pull request #5252 from ↵Jon Marius Venstad2018-03-088-29/+151
|\ | | | | | | | | vespa-engine/revert-5244-musum/only-allow-zk-access-from-config-servers-in-hosted-vespa Revert "Only allow Zookeeper access for config servers in hosted Vespa"
| * Revert "Only allow Zookeeper access for config servers in hosted Vespa"Harald Musum2018-03-088-29/+151
|/
* Merge pull request #5234 from ↵Geir Storli2018-03-0812-95/+164
|\ | | | | | | | | vespa-engine/geirst/improve-checking-of-merges-pending-in-clustercontroller Geirst/improve checking of merges pending in clustercontroller
| * Simplifications.Geir Storli2018-03-072-7/+3
| |
| * Fix AggregatedStatsMergePendingChecker to take state of aggregated cluster ↵Geir Storli2018-03-079-85/+134
| | | | | | | | | | | | | | | | | | | | stats into account. We may have merges pending if: - we don't yet have updates from all distributors - we don't have stats for the content node in question Also move mayHaveMergesPendingInGlobalSpace() to AggregatedStatsMergePendingChecker.
| * Also list derived bucket space states in html state.Geir Storli2018-03-072-3/+13
| |
| * Add bucket space column to html state.Geir Storli2018-03-071-6/+20
| |
* | Merge pull request #5250 from ↵Håkon Hallingstad2018-03-081-1/+1
|\ \ | | | | | | | | | | | | vespa-engine/freva/only-write-config-if-container-is-running Only write metrics config if container is running
| * | Only write metrics config if container is runningValerij Fredriksen2018-03-081-1/+1
| | |
* | | Merge pull request #5237 from ↵Jon Marius Venstad2018-03-084-22/+29
|\ \ \ | | | | | | | | | | | | | | | | vespa-engine/jvenstad/add-description-to-node-types Add descriptive name to each node type
| * | | Reorder to account for change in position in the enumJon Marius Venstad2018-03-073-12/+12
| | | |
| * | | Add descriptive name to each node typeJon Marius Venstad2018-03-071-10/+17
| | |/ | |/|
* | | Merge pull request #5251 from vespa-engine/bjorncs/bouncycastle-preinstallgjoranv2018-03-081-1/+0
|\ \ \ | | | | | | | | Remove reference to non-existing path
| * | | Remove reference to non-existing pathBjørn Christian Seime2018-03-081-1/+0
|/ / /
* | | Merge pull request #5249 from ↵Jon Bratseth2018-03-083-29/+16
|\ \ \ | |_|/ |/| | | | | | | | vespa-engine/balder/add-some-more-info-in-error-message Add some more information in identifying what caused this error.
| * | Remove unused parameter.Henning Baldersheim2018-03-083-28/+15
| | | | | | | | | | | | Remove catching Exception that can never be thown.
| * | Add some more information in identifying what caused this error.Henning Baldersheim2018-03-081-1/+1
| | |
* | | Merge pull request #5242 from vespa-engine/bjorncs/bouncycastle-preinstallgjoranv2018-03-0817-106/+74
|\ \ \ | | | | | | | | bjorncs+gv/bouncycastle preinstall
| * | | Add preinstall dependencies of jdisc_http_service to vespa rpmBjørn Christian Seime2018-03-071-0/+1
| | | |
| * | | Add preinstall dependencies of jdisc_http_service to container standalone rpmBjørn Christian Seime2018-03-071-0/+1
| | | |
| * | | Copy bouncycastle dependenciesBjørn Christian Seime2018-03-071-0/+16
| | | |
| * | | Use bouncycastle from container-dev.gjoranv2018-03-075-38/+17
| | | |
| * | | Jdisc provides bouncycastle now, so don't hide it.gjoranv2018-03-078-55/+21
| | | |
| * | | Don't bundle in BouncyCastle artifacts in vespa-athenzBjørn Christian Seime2018-03-071-0/+14
| | | |
| * | | Don't bundle in BouncyCastle artifacts in node-repositoryBjørn Christian Seime2018-03-071-4/+10
| | | |
| * | | Don't bundle in BouncyCastle artifacts in athenz-identity-provider-serviceBjørn Christian Seime2018-03-071-2/+2
| | | |
| * | | Don't package BouncyCastle artifacts in node-adminBjørn Christian Seime2018-03-071-17/+0
| | | |
| * | | Make BouncyCastle a pre-install requirement of jdisc_http_serviceBjørn Christian Seime2018-03-071-2/+4
| | | |
* | | | Merge pull request #5006 from ↵Jon Bratseth2018-03-089-116/+167
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | vespa-engine/hmusum/support-POST-for-prepare-and-activate Hmusum/support post for prepare and activate
| * | | AddHarald Musum2018-02-051-0/+96
| | | |
| * | | Support POST with app for prepareandactivateHarald Musum2018-02-058-116/+71
| | | | | | | | | | | | | | | | Start move to ApplicationApiHandler
* | | | Merge pull request #5244 from ↵Jon Bratseth2018-03-088-151/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | vespa-engine/musum/only-allow-zk-access-from-config-servers-in-hosted-vespa Only allow Zookeeper access for config servers in hosted Vespa
| * | | | Inline methodJon Bratseth2018-03-081-10/+5
| | | | |
| * | | | Only allow Zookeeper access for config servers in hosted VespaHarald Musum2018-03-078-146/+29
| | | | |
* | | | | Merge pull request #5246 from ↵Valerij Fredriksen2018-03-087-59/+37
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/revert-5245-revert-5238-freva/properly-set-config-server-ssl-options Revert "Revert "Properly set configserver client SSL options in Environment.Builder""
| * | | | | Revert "Revert "Properly set configserver client SSL options in ↵Valerij Fredriksen2018-03-087-59/+37
| | | | | | | | | | | | | | | | | | | | | | | | Environment.Builder""
* | | | | | Merge pull request #5248 from ↵Henning Baldersheim2018-03-081-2/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | vespa-engine/musum/dont-try-to-stop-filedistributor Filedisitributor is gone, don't try to stop it
| * | | | | Filedisitributor is gone, don't try to stop itHarald Musum2018-03-081-2/+0
|/ / / / /
* | | | | Merge pull request #5239 from vespa-engine/bjorncs/configserver-tls-on-awsHarald Musum2018-03-085-56/+25
|\ \ \ \ \ | | | | | | | | | | | | Bjorncs/configserver tls on aws
| * | | | | Don't unwrap parameters as separate fieldsBjørn Christian Seime2018-03-071-15/+6
| | | | | |
| * | | | | ZTS server endpoint is zone specificBjørn Christian Seime2018-03-075-8/+5
| | | | | |
| * | | | | Rewrite server TLS init to use bootstrap identity and allow AWSBjørn Christian Seime2018-03-075-38/+19
| | |_|/ / | |/| | |
* | | | | Merge pull request #5245 from ↵Valerij Fredriksen2018-03-087-37/+59
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/revert-5238-freva/properly-set-config-server-ssl-options Revert "Properly set configserver client SSL options in Environment.Builder"
| * | | | | Revert "Properly set configserver client SSL options in Environment.Builder"Håkon Hallingstad2018-03-087-37/+59
|/ / / / /
* | | | | Merge pull request #5238 from ↵Håkon Hallingstad2018-03-077-59/+37
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | vespa-engine/freva/properly-set-config-server-ssl-options Properly set configserver client SSL options in Environment.Builder
| * | | | Properly set configserver client SSL options in Environment.BuilderValerij Fredriksen2018-03-077-59/+37
| | | | |
* | | | | Merge pull request #5241 from vespa-engine/bratseth/tf-constants-in-parent-docLester Solbakken2018-03-0718-80/+205
|\ \ \ \ \ | | | | | | | | | | | | Bratseth/tf constants in parent doc
| * | | | | Remove support for slash in identifiersJon Bratseth2018-03-071-12/+1
| | | | | |
| * | | | | Allow macros to replace TenorFlow variablesJon Bratseth2018-03-0711-52/+181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, remove quoting of constant arguments generated in TensorFlow as that is unnecessary now and is interpreted as a string constant argument to a macro.