summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Clean up unused codeHenning Baldersheim2018-11-1419-416/+119
|
* Use nested namespace and general code unification.Henning Baldersheim2018-11-1436-570/+246
|
* Merge pull request #7662 from ↵Tor Brede Vekterli2018-11-141-20/+20
|\ | | | | | | | | vespa-engine/vekterli/warn-on-divergent-timestamp-updates Warn on updates done against divergent timestamps
| * Warn on updates done against divergent timestampsTor Brede Vekterli2018-11-141-20/+20
| | | | | | | | | | | | | | | | | | | | This should not happen during normal operation as the distributor should be aware if bucket replicas are out of sync before deciding whether an update requires a two-phase fallback. Warning for now to see if it can be observed anywhere. The logic surrounding the warning will likely be rewritten to treat this as an explicit failure at a later point.
* | Merge pull request #7619 from ↵Valerij Fredriksen2018-11-145-68/+3
|\ \ | | | | | | | | | | | | vespa-engine/freva/remove-container-environment-resolver Remove ContainerEnvironmentResolver
| * | Remove unused method and variable from ConfigServerInfoValerij Fredriksen2018-11-141-6/+0
| | |
| * | Do not set VESPA_CONFIGSERVERS in DockerOperationsValerij Fredriksen2018-11-143-11/+3
| | |
| * | Remove ContainerEnvironmentResolverValerij Fredriksen2018-11-134-53/+2
| | |
* | | Merge pull request #7656 from ↵Håkon Hallingstad2018-11-141-1/+1
|\ \ \ | | | | | | | | | | | | | | | | vespa-engine/hakonhall/honor-javahome-even-if-java-is-in-path Honor JAVA_HOME even if java is in PATH
| * | | Honor JAVA_HOME even if java is in PATHHåkon Hallingstad2018-11-141-1/+1
| | | |
* | | | Merge pull request #7657 from vespa-engine/gjoranv/use-full-path-to-curlgjoranv2018-11-141-1/+1
|\ \ \ \ | | | | | | | | | | Yamas-agent seems to need full path to curl binary.
| * | | | Yamas-agent seems to need full path to curl binary.gjoranv2018-11-141-1/+1
|/ / / /
* | | | Merge pull request #7651 from ↵Martin Polden2018-11-147-14/+118
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | vespa-engine/bratseth/control-major-version-in-upgrader Allow controlling major version in the upgrader
| * | | | Correct javadocJon Bratseth2018-11-141-1/+1
| | | | |
| * | | | Allow controlling major version in the upgraderJon Bratseth2018-11-147-14/+118
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible to set the target major Vespa version in the upgrader explicitly for applications that do not. This allows us to do a more controlled rollout of new major versions.
* | | | Merge pull request #7638 from vespa-engine/bratseth/consolidate-match-settingArne H Juul2018-11-147-41/+113
|\ \ \ \ | |/ / / |/| | | Consolidate match setting
| * | | Consolidate match settingJon Bratseth2018-11-137-41/+113
| |/ /
* | | Merge pull request #7648 from ↵Valerij Fredriksen2018-11-131-1/+15
|\ \ \ | | | | | | | | | | | | | | | | vespa-engine/hakonhall/increase-nproc-resource-limit Increase nproc resource limit
| * | | Increase nproc resource limitHåkon Hallingstad2018-11-131-1/+15
| |/ /
* | | Merge pull request #7645 from vespa-engine/geirst/update-travis-build-scriptGeir Storli2018-11-131-1/+2
|\ \ \ | | | | | | | | Update to reflect changes in docker-image-dev.
| * | | Update to reflect changes in docker-image-dev.Geir Storli2018-11-131-1/+2
| | |/ | |/|
* | | Merge pull request #7641 from vespa-engine/balder/avoid-core-on-reconfigHenning Baldersheim2018-11-134-51/+33
|\ \ \ | | | | | | | | Add test and fix that repeated reconfigs works for schema changes.
| * | | Add clarifying comment.Henning Baldersheim2018-11-131-0/+1
| | | |
| * | | Add test and fix that repeated reconfigs works for schema changes.Henning Baldersheim2018-11-134-51/+32
| | |/ | |/|
* | | Merge pull request #7642 from vespa-engine/mpolden/allow-forcing-downgradeMartin Polden2018-11-135-7/+11
|\ \ \ | |_|/ |/| | Allow forcing downgrade of OS
| * | Allow forcing downgrade of OSMartin Polden2018-11-135-7/+11
| |/
* | Merge pull request #7608 from ↵Tor Brede Vekterli2018-11-1322-37/+827
|\ \ | |/ |/| | | | | vespa-engine/vekterli/add-support-for-basic-certificate-verification-policies Add support for basic certificate verification policies in C++
| * `Cursor` -> `Inspector` for parsingTor Brede Vekterli2018-11-131-4/+4
| |
| * Correct test nameTor Brede Vekterli2018-11-131-1/+1
| |
| * Use explicit `const` for `auto`Tor Brede Vekterli2018-11-131-3/+3
| |
| * Add support for basic certificate verification policies in C++Tor Brede Vekterli2018-11-0822-36/+826
| | | | | | | | | | | | | | | | Extends TLS config JSON file with an `allowed-peers` object, which if non-empty specifies a set of policies that a peer may match. If at least one policy exists a peer must match all requirements in any single policy to be allowed to connect. I.e. it's sufficient to match 1 policy out of many.
* | Merge pull request #7637 from vespa-engine/bratseth/truncate-time-2Jon Bratseth2018-11-121-1/+1
|\ \ | | | | | | Truncate time
| * | Truncate timeJon Bratseth2018-11-121-1/+1
|/ /
* | Merge pull request #7634 from vespa-engine/freva/node-restart-gen-fixValerij Fredriksen2018-11-121-2/+7
|\ \ | | | | | | Fix restart generation bug
| * | Fix restart generation bugValerij Fredriksen2018-11-121-2/+7
| | |
* | | Merge pull request #7631 from vespa-engine/olaa/log-changesJon Marius Venstad2018-11-121-10/+3
|\ \ \ | | | | | | | | Print stacktrace of last exception. Remove logging of 0 qps deployments
| * | | Print stacktrace of last exception. Remove logging of 0 qps deploymentsOla Aunrønning2018-11-121-10/+3
| | | |
* | | | Merge pull request #7629 from ↵Valerij Fredriksen2018-11-121-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | vespa-engine/jvenstad/prune-based-on-prod-deployments-only Check only production deployments for versions
| * | | | Check only production deployments for versionsJon Marius Venstad2018-11-121-1/+1
| | | | |
* | | | | Merge pull request #7628 from ↵gjoranv2018-11-121-17/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/hmusum/support-xml-schemas-for-any-major-version Support any major version when looking for XML schemas
| * | | | | Support any major version when looking for XML schemasHarald Musum2018-11-121-17/+19
| | |_|/ / | |/| | |
* | | | | Merge pull request #7630 from vespa-engine/arnej/bump-todos-versionHenning Baldersheim2018-11-124-4/+4
|\ \ \ \ \ | |_|_|/ / |/| | | | some TODOs cannot be done in time for Vespa 7
| * | | | some TODOs cannot be done in time for Vespa 7Arne Juul2018-11-124-4/+4
| | |/ / | |/| |
* | | | Merge pull request #7623 from ↵Håkon Hallingstad2018-11-124-30/+75
|\ \ \ \ | |/ / / |/| | | | | | | | | | | vespa-engine/hakonhall/make-tenant-keys-and-certificates-readable-by-1000-only Make tenant keys and certificates readable by 1000 only
| * | | Remove old tmp fileHåkon Hallingstad2018-11-122-3/+5
| | | |
| * | | Rename fieldHåkon Hallingstad2018-11-121-4/+4
| | | |
| * | | Make atomicMove return UnixPath to new pathHåkon Hallingstad2018-11-121-2/+2
| | | |
| * | | Use username insteadHåkon Hallingstad2018-11-1211-48/+41
| | | |
| * | | Make tenant keys and certificates readable by 1000 onlyHåkon Hallingstad2018-11-0911-28/+78
| | | |
* | | | Merge pull request #7595 from vespa-engine/musum/simplify-supermodel-part-2Harald Musum2018-11-128-117/+115
|\ \ \ \ | |_|/ / |/| | | Simplify supermodel, part 2