summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove DocBlockCommand and DocBlockReply from storage api.Tor Egge2017-10-187-219/+0
* Take document::Bucket instead of document::BucketId as constructorTor Egge2017-10-1816-70/+99
* Merge pull request #3804 from vespa-engine/hmusum/remove-allocated-hosts-per-...Jon Bratseth2017-10-182-39/+4
|\
| * 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 nameBjørn Christian Seime2017-10-181-5/+9
* | | Merge pull request #3787 from vespa-engine/bjorncs/athenzMorten Tokle2017-10-1833-220/+220
|\ \ \
| * | | Rename 'athens' -> 'athenz'Bjørn Christian Seime2017-10-179-72/+72
| * | | 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
|\ \ \ \
| * | | | 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 vespa-engine/toregge/add-bucket-space-to-storag...Tor Brede Vekterli2017-10-1886-484/+606
|\ \ \ \ \
| * | | | | Take document::Bucket instead of document::BucketId as constructorTor Egge2017-10-1782-405/+606
| * | | | | 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 typoBjørn Christian Seime2017-10-181-1/+1
|/ / / / /
* | | | | Merge pull request #3797 from vespa-engine/hmusum/log-when-events-possibly-mi...Harald Musum2017-10-186-6/+51
|\ \ \ \ \
| * | | | | Log when getting possibly unhandled event for application changeHarald Musum2017-10-176-6/+51
* | | | | | Merge pull request #3785 from vespa-engine/hakonhall/retry-on-non-client-http...Håkon Hallingstad2017-10-173-15/+51
|\ \ \ \ \ \
| * | | | | | 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
|\ \ \ \ \ \
| * | | | | | 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 vespa-engine/revert-3792-balder/wire-in-a-destr...Henning Baldersheim2017-10-1720-134/+99
|\ \ \ \ \ \ \
| * | | | | | | Revert "Introduce async write interface in the TLS."Henning Baldersheim2017-10-1720-134/+99
|/ / / / / / /
* | | | | | | Merge pull request #3798 from vespa-engine/revert-3795-balder/wire-in-a-destr...Henning Baldersheim2017-10-171-1/+3
|\ \ \ \ \ \ \
| * | | | | | | Revert "Use the existing sync method."Henning Baldersheim2017-10-171-1/+3
|/ / / / / / /
* | | | | | | Merge pull request #3793 from vespa-engine/balder/do-not-acces-members-that-a...Henning Baldersheim2017-10-171-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Do not access the FS4 server unless it is constructed.Henning Baldersheim2017-10-171-1/+1
* | | | | | | | Merge pull request #3789 from vespa-engine/hmusum/add-persisted-setting-for-i...Harald Musum2017-10-178-23/+129
|\ \ \ \ \ \ \ \
| * | | | | | | | Add persistent setting for ignoring confidence calulationsHarald Musum2017-10-178-23/+129
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #3790 from vespa-engine/jvenstad/catch-metrics-fetching-er...Jon Marius Venstad2017-10-171-8/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | Ignore timeouts (retried later anyway) and reduce locking timeJon Marius Venstad2017-10-171-8/+25
* | | | | | | | | Merge pull request #3795 from vespa-engine/balder/wire-in-a-destructor-callbackHenning Baldersheim2017-10-171-3/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use the existing sync method.Henning Baldersheim2017-10-171-3/+1
* | | | | | | | | | Merge pull request #3792 from vespa-engine/balder/wire-in-a-destructor-callbackHenning Baldersheim2017-10-1720-99/+134
|\| | | | | | | | | | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Introduce async write interface in the TLS.Henning Baldersheim2017-10-1720-99/+134
| |/ / / / / / /
* | | | | | | | Merge pull request #3794 from vespa-engine/bjorncs/travisBjørn Christian Seime2017-10-173-17/+6
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Test 'make install' as part of cpp build. Remove 'install' jobBjørn Christian Seime2017-10-173-17/+6
|/ / / / / / /
* | | | | | | Merge pull request #3791 from vespa-engine/geirst/add-guard-in-directory-scan...Henning Baldersheim2017-10-171-1/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add guard against file being removed while doing directory scan.Geir Storli2017-10-171-1/+5
|/ / / / / /
* | | | | | Merge pull request #3784 from vespa-engine/bjorncs/bootstrap-cpp-1Geir Storli2017-10-171-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Revert back to /opt/rh/devtoolset-6/enableBjørn Christian Seime2017-10-171-1/+1
|/ / / / /
* | | | | Merge pull request #3763 from vespa-engine/bjorncs/travisArnstein Ressem2017-10-179-26/+92
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix bug where usage would never be printedBjørn Christian Seime2017-10-171-4/+4
| * | | | Improve Travis buildsBjørn Christian Seime2017-10-167-18/+60