Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update error message for bundled defs without package or namespace | gjoranv | 2017-10-18 | 1 | -1/+1 |
| | |||||
* | Merge pull request #3806 from ↵ | Harald Musum | 2017-10-18 | 1 | -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 redeployed | Harald Musum | 2017-10-18 | 1 | -3/+6 |
| | | |||||
* | | Merge pull request #3802 from ↵ | Henning Baldersheim | 2017-10-18 | 20 | -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 Baldersheim | 2017-10-18 | 1 | -4/+4 |
| | | | |||||
| * | | Use make_shared/make_unique | Henning Baldersheim | 2017-10-18 | 1 | -16/+18 |
| | | | |||||
| * | | Use the existing sync method. | Henning Baldersheim | 2017-10-18 | 1 | -3/+1 |
| | | | |||||
| * | | Introduce async write interface in the TLS. | Henning Baldersheim | 2017-10-18 | 20 | -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/athenz | gjoranv | 2017-10-18 | 7 | -33/+33 |
|\ \ \ | | | | | | | | | Rename Athens->Athenz | ||||
| * | | | Rename Athens->Athenz | Bjørn Christian Seime | 2017-10-18 | 7 | -33/+33 |
| | | | | |||||
* | | | | Merge pull request #3782 from vespa-engine/balder/remove-searchxxxpolicy | Henning Baldersheim | 2017-10-18 | 24 | -1113/+73 |
|\ \ \ \ | |_|_|/ |/| | | | Balder/remove searchxxxpolicy | ||||
| * | | | Merge branch 'master' into balder/remove-searchxxxpolicy | Henning Baldersheim | 2017-10-17 | 6 | -12/+8 |
| |\ \ \ | |||||
| * | | | | No more SERVICE_OOS | Henning Baldersheim | 2017-10-17 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | remove long gone SearchRow and SearchColumn policies. | Henning Baldersheim | 2017-10-17 | 9 | -490/+3 |
| | | | | | |||||
| * | | | | Remove testing of unused features. | Henning Baldersheim | 2017-10-17 | 1 | -7/+1 |
| | | | | | |||||
| * | | | | Remove unused code | Henning Baldersheim | 2017-10-17 | 1 | -46/+0 |
| | | | | | |||||
| * | | | | Remove SERVICE_OOS from c++ | Henning Baldersheim | 2017-10-17 | 13 | -574/+74 |
| | | | | | |||||
| * | | | | Fully remove OOS stuff from java too. | Henning Baldersheim | 2017-10-17 | 13 | -107/+32 |
| | | | | | |||||
| * | | | | Remove some java OSS stuff too. | Henning Baldersheim | 2017-10-17 | 7 | -650/+1 |
| | | | | | |||||
| * | | | | Remove OSS from c++ | Henning Baldersheim | 2017-10-17 | 28 | -1053/+64 |
| | | | | | |||||
* | | | | | Merge pull request #3804 from ↵ | Jon Bratseth | 2017-10-18 | 2 | -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 version | Harald Musum | 2017-10-18 | 2 | -39/+4 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #3801 from vespa-engine/bjorncs/athenz-migration | gjoranv | 2017-10-18 | 1 | -5/+9 |
|\ \ \ \ | | | | | | | | | | | Only create Athenz resource group once for each appliation name | ||||
| * | | | | Only create Athenz resource group once for each appliation name | Bjørn Christian Seime | 2017-10-18 | 1 | -5/+9 |
| | | | | | |||||
* | | | | | Merge pull request #3787 from vespa-engine/bjorncs/athenz | Morten Tokle | 2017-10-18 | 33 | -220/+220 |
|\ \ \ \ \ | | | | | | | | | | | | | Bjorncs/athenz | ||||
| * | | | | | Rename 'athens' -> 'athenz' | Bjørn Christian Seime | 2017-10-17 | 9 | -72/+72 |
| | | | | | | | | | | | | | | | | | | | | | | | | Rename private varibles/fields and test symbols from 'athens' to 'athenz' | ||||
| * | | | | | Rename AthensDomainResponse -> AthenzDomainResponse | Bjørn Christian Seime | 2017-10-17 | 2 | -4/+4 |
| | | | | | | |||||
| * | | | | | Rename AthensDbMock -> AthenzDbMock | Bjørn Christian Seime | 2017-10-17 | 8 | -32/+32 |
| | | | | | | |||||
| * | | | | | Rename AthensDomain -> AthenzDomain | Bjørn Christian Seime | 2017-10-17 | 31 | -134/+134 |
| | | | | | | |||||
* | | | | | | Merge pull request #3786 from vespa-engine/gjoranv/use-container-test | Bjørn Christian Seime | 2017-10-18 | 1 | -2/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Use container-test instead of application. | ||||
| * | | | | | | Remove explicit version of junit. | gjoranv | 2017-10-17 | 1 | -1/+0 |
| | | | | | | | |||||
| * | | | | | | Use container-test instead of application. | gjoranv | 2017-10-17 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #3783 from ↵ | Tor Brede Vekterli | 2017-10-18 | 86 | -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 constructor | Tor Egge | 2017-10-17 | 82 | -405/+606 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | argument to storage commands that inherit from BucketCommand. | ||||
| * | | | | | | | Remove createCopyToForward() methods, they are not used. | Tor Egge | 2017-10-17 | 8 | -79/+0 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #3800 from vespa-engine/bjorncs/travis | Bjørn Christian Seime | 2017-10-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | Fix typo | ||||
| * | | | | | | | Fix typo | Bjørn Christian Seime | 2017-10-18 | 1 | -1/+1 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #3797 from ↵ | Harald Musum | 2017-10-18 | 6 | -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 change | Harald Musum | 2017-10-17 | 6 | -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 Hallingstad | 2017-10-17 | 3 | -15/+51 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/hakonhall/retry-on-non-client-http-errors Retry on non-client HTTP errors | ||||
| * | | | | | | | Retry on non-client HTTP errors | Håkon Hallingstad | 2017-10-17 | 3 | -15/+51 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #3781 from vespa-engine/arnej/add-uptime-metric-for-sentinel | Arne H Juul | 2017-10-17 | 3 | -10/+38 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Arnej/add uptime metric for sentinel | ||||
| * | | | | | | | sentinel.uptime could be useful | Arne Juul | 2017-10-17 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | add "uptime" metric | Arne Juul | 2017-10-16 | 1 | -9/+36 |
| | | | | | | | | |||||
| * | | | | | | | count restart of sentinel itself | Arne Juul | 2017-10-16 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #3799 from ↵ | Henning Baldersheim | 2017-10-17 | 20 | -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 Baldersheim | 2017-10-17 | 20 | -134/+99 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #3798 from ↵ | Henning Baldersheim | 2017-10-17 | 1 | -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 Baldersheim | 2017-10-17 | 1 | -1/+3 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #3793 from ↵ | Henning Baldersheim | 2017-10-17 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/balder/do-not-acces-members-that-are-not-initialized Do not access the FS4 server unless it is constructed. |