aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [6.159.25-1].vespa-6.159.25-1by-screwdriver2017-10-184-1/+2
| | | | | | Created by command: /usr/bin/tito tag --use-version=6.159.25 --no-auto-changelog
* 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.
| * | Do not access the FS4 server unless it is constructed.Henning Baldersheim2017-10-171-1/+1
| | |
* | | Merge pull request #3789 from ↵Harald Musum2017-10-178-23/+129
|\ \ \ | | | | | | | | | | | | | | | | vespa-engine/hmusum/add-persisted-setting-for-ignoring-confidence-calculations Add persistent setting for ignoring confidence calculations
| * | | Add persistent setting for ignoring confidence calulationsHarald Musum2017-10-178-23/+129
| | | |
* | | | Merge pull request #3790 from ↵Jon Marius Venstad2017-10-171-8/+25
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | vespa-engine/jvenstad/catch-metrics-fetching-errors-and-reduce-locking Ignore timeouts (retried later anyway) and reduce locking time
| * | | | 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.
| * | | | | 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.
| * | | | | Introduce async write interface in the TLS.Henning Baldersheim2017-10-1720-99/+134
| |/ / / / | | | | | | | | | | | | | | | | | | | | Wire it in all the way up and in to proton. The implementation is still synchronous.
* | | | | 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' job
| * | | | Test 'make install' as part of cpp build. Remove 'install' jobBjørn Christian Seime2017-10-173-17/+6
|/ / / /
* | | | Merge pull request #3791 from ↵Henning Baldersheim2017-10-171-1/+5
|\ \ \ \ | |/ / / |/| | | | | | | | | | | vespa-engine/geirst/add-guard-in-directory-scan-for-disk-sampling Add guard against file being removed while doing directory scan.
| * | | 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/enable
| * | | 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
|\ \ \ | |/ / |/| | Bjorncs/travis
| * | 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
| | | | | | | | | | | | | | | Test install step as separate job for PRs. Use single job for complete build for master branch.
| * | Split out cmake command into separate bootstrap scriptBjørn Christian Seime2017-10-162-8/+32
| | |
* | | Merge pull request #3779 from vespa-engine/balder/remove-oosmanager-c++Arne H Juul2017-10-1747-1815/+97
|\ \ \ | | | | | | | | Balder/remove oosmanager c++
| * | | remove OOS remnantsArne Juul2017-10-172-5/+0
| | | |
| * | | Fully remove OOS stuff from java too.Henning Baldersheim2017-10-1613-107/+32
| | | |
| * | | Merge branch 'balder/remove-oosmanager-c++' of github.com:vespa-engine/vespa ↵Henning Baldersheim2017-10-1638-1825/+85
| |\ \ \ | | | | | | | | | | | | | | | into balder/remove-oosmanager-c++
| | * | | Remove some java OSS stuff too.Henning Baldersheim2017-10-167-650/+1
| | | | |
| | * | | Remove OSS from c++Henning Baldersheim2017-10-1628-1053/+64
| | | | |
| | * | | Remove functionality from pre SPI era.Henning Baldersheim2017-10-165-122/+20
| | | | |
* | | | | Merge pull request #3780 from vespa-engine/bjorncs/bouncycastlegjoranv2017-10-171-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Use BouncyCastle 1.58
| * | | | | Use BouncyCastle 1.58Bjørn Christian Seime2017-10-171-1/+1
| | | | | |
* | | | | | Merge pull request #3778 from vespa-engine/hmusum/find-reserved-names-onceLester Solbakken2017-10-171-4/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Find reserved names when loading class
| * | | | | | Use ImmutableSetHarald Musum2017-10-171-3/+4
| | | | | | |
| * | | | | | Find reserved names when loading classHarald Musum2017-10-171-2/+2
| | | | | | |
* | | | | | | Merge pull request #3777 from vespa-engine/hakonhall/enable-new-service-monitorHarald Musum2017-10-171-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Enable new service monitor
| * | | | | | Enable new service monitorHåkon Hallingstad2017-10-171-1/+1
|/ / / / / /
* / / / / / Serverpool in ZK (#3764)Valerij Fredriksen2017-10-171-3/+35
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | * Serverpool in ZK * Change timeouts
* | | | | Merge pull request #3770 from vespa-engine/balder/remove-ooscliArne H Juul2017-10-175-122/+20
|\ \ \ \ \ | | | | | | | | | | | | Remove functionality from pre SPI era.
| * | | | | Remove functionality from pre SPI era.Henning Baldersheim2017-10-165-122/+20
| | | | | |
* | | | | | Merge pull request #3772 from vespa-engine/bjorncs/athenz-migrationJon Bratseth2017-10-171-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Method should be PUT, not POST
| * | | | | Method should be PUT, not POSTBjørn Christian Seime2017-10-161-1/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #3776 from vespa-engine/bjorncs/fixBjørn Christian Seime2017-10-161-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix typo
| * | | | | Fix typoBjørn Christian Seime2017-10-161-1/+1
|/ / / / /