summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update error message for bundled defs without package or namespacegjoranv2017-10-181-1/+1
|
* Merge pull request #3806 from ↵Harald Musum2017-10-181-3/+6
|\ | | | | | | | | vespa-engine/hmusum/do-not-log-when-application-got-redeployed Do not log when application got redeployed
| * Do not log when application got redeployedHarald Musum2017-10-181-3/+6
| |
* | Merge pull request #3802 from ↵Henning Baldersheim2017-10-1820-114/+149
|\ \ | | | | | | | | | | | | vespa-engine/balder/wire-in-a-destructor-callback-take-2 Balder/wire in a destructor callback take 2
| * | Here we can not move the token. We need it ourselves.Henning Baldersheim2017-10-181-4/+4
| | |
| * | Use make_shared/make_uniqueHenning Baldersheim2017-10-181-16/+18
| | |
| * | Use the existing sync method.Henning Baldersheim2017-10-181-3/+1
| | |
| * | Introduce async write interface in the TLS.Henning Baldersheim2017-10-1820-99/+134
| | | | | | | | | | | | | | | Wire it in all the way up and in to proton. The implementation is still synchronous.
* | | Merge pull request #3803 from vespa-engine/bjorncs/athenzgjoranv2017-10-187-33/+33
|\ \ \ | | | | | | | | Rename Athens->Athenz
| * | | Rename Athens->AthenzBjørn Christian Seime2017-10-187-33/+33
| | | |
* | | | Merge pull request #3782 from vespa-engine/balder/remove-searchxxxpolicyHenning Baldersheim2017-10-1824-1113/+73
|\ \ \ \ | |_|_|/ |/| | | Balder/remove searchxxxpolicy
| * | | Merge branch 'master' into balder/remove-searchxxxpolicyHenning Baldersheim2017-10-176-12/+8
| |\ \ \
| * | | | No more SERVICE_OOSHenning Baldersheim2017-10-171-1/+0
| | | | |
| * | | | remove long gone SearchRow and SearchColumn policies.Henning Baldersheim2017-10-179-490/+3
| | | | |
| * | | | Remove testing of unused features.Henning Baldersheim2017-10-171-7/+1
| | | | |
| * | | | Remove unused codeHenning Baldersheim2017-10-171-46/+0
| | | | |
| * | | | Remove SERVICE_OOS from c++Henning Baldersheim2017-10-1713-574/+74
| | | | |
| * | | | Fully remove OOS stuff from java too.Henning Baldersheim2017-10-1713-107/+32
| | | | |
| * | | | Remove some java OSS stuff too.Henning Baldersheim2017-10-177-650/+1
| | | | |
| * | | | Remove OSS from c++Henning Baldersheim2017-10-1728-1053/+64
| | | | |
* | | | | Merge pull request #3804 from ↵Jon Bratseth2017-10-182-39/+4
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | vespa-engine/hmusum/remove-allocated-hosts-per-version-support Remove compatibility code for allocated hosts stored per version
| * | | | Remove compatibility code for allocated hosts stored per versionHarald Musum2017-10-182-39/+4
| | |_|/ | |/| |
* | | | Merge pull request #3801 from vespa-engine/bjorncs/athenz-migrationgjoranv2017-10-181-5/+9
|\ \ \ \ | | | | | | | | | | Only create Athenz resource group once for each appliation name
| * | | | Only create Athenz resource group once for each appliation nameBjørn Christian Seime2017-10-181-5/+9
| | | | |
* | | | | Merge pull request #3787 from vespa-engine/bjorncs/athenzMorten Tokle2017-10-1833-220/+220
|\ \ \ \ \ | | | | | | | | | | | | Bjorncs/athenz
| * | | | | Rename 'athens' -> 'athenz'Bjørn Christian Seime2017-10-179-72/+72
| | | | | | | | | | | | | | | | | | | | | | | | Rename private varibles/fields and test symbols from 'athens' to 'athenz'
| * | | | | Rename AthensDomainResponse -> AthenzDomainResponseBjørn Christian Seime2017-10-172-4/+4
| | | | | |
| * | | | | Rename AthensDbMock -> AthenzDbMockBjørn Christian Seime2017-10-178-32/+32
| | | | | |
| * | | | | Rename AthensDomain -> AthenzDomainBjørn Christian Seime2017-10-1731-134/+134
| | | | | |
* | | | | | Merge pull request #3786 from vespa-engine/gjoranv/use-container-testBjørn Christian Seime2017-10-181-2/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use container-test instead of application.
| * | | | | | Remove explicit version of junit.gjoranv2017-10-171-1/+0
| | | | | | |
| * | | | | | Use container-test instead of application.gjoranv2017-10-171-1/+1
| | | | | | |
* | | | | | | Merge pull request #3783 from ↵Tor Brede Vekterli2017-10-1886-484/+606
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/toregge/add-bucket-space-to-storage-commands-pass3 Use document::Bucket constructor argument for subclasses for BucketCommand
| * | | | | | | Take document::Bucket instead of document::BucketId as constructorTor Egge2017-10-1782-405/+606
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | argument to storage commands that inherit from BucketCommand.
| * | | | | | | Remove createCopyToForward() methods, they are not used.Tor Egge2017-10-178-79/+0
| | | | | | | |
* | | | | | | | Merge pull request #3800 from vespa-engine/bjorncs/travisBjørn Christian Seime2017-10-181-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | Fix typo
| * | | | | | | Fix typoBjørn Christian Seime2017-10-181-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #3797 from ↵Harald Musum2017-10-186-6/+51
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/hmusum/log-when-events-possibly-missed Log when getting possibly unhandled event for application change
| * | | | | | | Log when getting possibly unhandled event for application changeHarald Musum2017-10-176-6/+51
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * No changes to when we delete applications, but log to hopefully get more information if we are in a situation where we could have missed an event for deleting an application
* | | | | | | Merge pull request #3785 from ↵Håkon Hallingstad2017-10-173-15/+51
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/hakonhall/retry-on-non-client-http-errors Retry on non-client HTTP errors
| * | | | | | | Retry on non-client HTTP errorsHåkon Hallingstad2017-10-173-15/+51
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #3781 from vespa-engine/arnej/add-uptime-metric-for-sentinelArne H Juul2017-10-173-10/+38
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Arnej/add uptime metric for sentinel
| * | | | | | | sentinel.uptime could be usefulArne Juul2017-10-171-0/+1
| | | | | | | |
| * | | | | | | add "uptime" metricArne Juul2017-10-161-9/+36
| | | | | | | |
| * | | | | | | count restart of sentinel itselfArne Juul2017-10-161-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #3799 from ↵Henning Baldersheim2017-10-1720-134/+99
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/revert-3792-balder/wire-in-a-destructor-callback Revert "Introduce async write interface in the TLS."
| * | | | | | | | Revert "Introduce async write interface in the TLS."Henning Baldersheim2017-10-1720-134/+99
|/ / / / / / / /
* | | | | | | | Merge pull request #3798 from ↵Henning Baldersheim2017-10-171-1/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/revert-3795-balder/wire-in-a-destructor-callback Revert "Use the existing sync method."
| * | | | | | | | Revert "Use the existing sync method."Henning Baldersheim2017-10-171-1/+3
|/ / / / / / / /
* | | | | | | | Merge pull request #3793 from ↵Henning Baldersheim2017-10-171-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/balder/do-not-acces-members-that-are-not-initialized Do not access the FS4 server unless it is constructed.