Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Automatic commit of package [vespa] release [6.159.25-1].vespa-6.159.25-1 | by-screwdriver | 2017-10-18 | 4 | -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-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. | ||||
| * | | Do not access the FS4 server unless it is constructed. | Henning Baldersheim | 2017-10-17 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #3789 from ↵ | Harald Musum | 2017-10-17 | 8 | -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 calulations | Harald Musum | 2017-10-17 | 8 | -23/+129 |
| | | | | |||||
* | | | | Merge pull request #3790 from ↵ | Jon Marius Venstad | 2017-10-17 | 1 | -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 time | Jon Marius Venstad | 2017-10-17 | 1 | -8/+25 |
| | | | | | |||||
* | | | | | Merge pull request #3795 from vespa-engine/balder/wire-in-a-destructor-callback | Henning Baldersheim | 2017-10-17 | 1 | -3/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Use the existing sync method. | ||||
| * | | | | | Use the existing sync method. | Henning Baldersheim | 2017-10-17 | 1 | -3/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #3792 from vespa-engine/balder/wire-in-a-destructor-callback | Henning Baldersheim | 2017-10-17 | 20 | -99/+134 |
|\| | | | | | | | | | | | | | | | | | Introduce async write interface in the TLS. | ||||
| * | | | | | Introduce async write interface in the TLS. | Henning Baldersheim | 2017-10-17 | 20 | -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/travis | Bjørn Christian Seime | 2017-10-17 | 3 | -17/+6 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Test 'make install' as part of cpp build. Remove 'install' job | ||||
| * | | | | Test 'make install' as part of cpp build. Remove 'install' job | Bjørn Christian Seime | 2017-10-17 | 3 | -17/+6 |
|/ / / / | |||||
* | | | | Merge pull request #3791 from ↵ | Henning Baldersheim | 2017-10-17 | 1 | -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 Storli | 2017-10-17 | 1 | -1/+5 |
|/ / / | |||||
* | | | Merge pull request #3784 from vespa-engine/bjorncs/bootstrap-cpp-1 | Geir Storli | 2017-10-17 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Revert back to /opt/rh/devtoolset-6/enable | ||||
| * | | | Revert back to /opt/rh/devtoolset-6/enable | Bjørn Christian Seime | 2017-10-17 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #3763 from vespa-engine/bjorncs/travis | Arnstein Ressem | 2017-10-17 | 9 | -26/+92 |
|\ \ \ | |/ / |/| | | Bjorncs/travis | ||||
| * | | Fix bug where usage would never be printed | Bjørn Christian Seime | 2017-10-17 | 1 | -4/+4 |
| | | | |||||
| * | | Improve Travis builds | Bjørn Christian Seime | 2017-10-16 | 7 | -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 script | Bjørn Christian Seime | 2017-10-16 | 2 | -8/+32 |
| | | | |||||
* | | | Merge pull request #3779 from vespa-engine/balder/remove-oosmanager-c++ | Arne H Juul | 2017-10-17 | 47 | -1815/+97 |
|\ \ \ | | | | | | | | | Balder/remove oosmanager c++ | ||||
| * | | | remove OOS remnants | Arne Juul | 2017-10-17 | 2 | -5/+0 |
| | | | | |||||
| * | | | Fully remove OOS stuff from java too. | Henning Baldersheim | 2017-10-16 | 13 | -107/+32 |
| | | | | |||||
| * | | | Merge branch 'balder/remove-oosmanager-c++' of github.com:vespa-engine/vespa ↵ | Henning Baldersheim | 2017-10-16 | 38 | -1825/+85 |
| |\ \ \ | | | | | | | | | | | | | | | | into balder/remove-oosmanager-c++ | ||||
| | * | | | Remove some java OSS stuff too. | Henning Baldersheim | 2017-10-16 | 7 | -650/+1 |
| | | | | | |||||
| | * | | | Remove OSS from c++ | Henning Baldersheim | 2017-10-16 | 28 | -1053/+64 |
| | | | | | |||||
| | * | | | Remove functionality from pre SPI era. | Henning Baldersheim | 2017-10-16 | 5 | -122/+20 |
| | | | | | |||||
* | | | | | Merge pull request #3780 from vespa-engine/bjorncs/bouncycastle | gjoranv | 2017-10-17 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Use BouncyCastle 1.58 | ||||
| * | | | | | Use BouncyCastle 1.58 | Bjørn Christian Seime | 2017-10-17 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #3778 from vespa-engine/hmusum/find-reserved-names-once | Lester Solbakken | 2017-10-17 | 1 | -4/+5 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Find reserved names when loading class | ||||
| * | | | | | | Use ImmutableSet | Harald Musum | 2017-10-17 | 1 | -3/+4 |
| | | | | | | | |||||
| * | | | | | | Find reserved names when loading class | Harald Musum | 2017-10-17 | 1 | -2/+2 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #3777 from vespa-engine/hakonhall/enable-new-service-monitor | Harald Musum | 2017-10-17 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Enable new service monitor | ||||
| * | | | | | | Enable new service monitor | Håkon Hallingstad | 2017-10-17 | 1 | -1/+1 |
|/ / / / / / | |||||
* / / / / / | Serverpool in ZK (#3764) | Valerij Fredriksen | 2017-10-17 | 1 | -3/+35 |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | * Serverpool in ZK * Change timeouts | ||||
* | | | | | Merge pull request #3770 from vespa-engine/balder/remove-ooscli | Arne H Juul | 2017-10-17 | 5 | -122/+20 |
|\ \ \ \ \ | | | | | | | | | | | | | Remove functionality from pre SPI era. | ||||
| * | | | | | Remove functionality from pre SPI era. | Henning Baldersheim | 2017-10-16 | 5 | -122/+20 |
| | | | | | | |||||
* | | | | | | Merge pull request #3772 from vespa-engine/bjorncs/athenz-migration | Jon Bratseth | 2017-10-17 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Method should be PUT, not POST | ||||
| * | | | | | Method should be PUT, not POST | Bjørn Christian Seime | 2017-10-16 | 1 | -1/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #3776 from vespa-engine/bjorncs/fix | Bjørn Christian Seime | 2017-10-16 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix typo | ||||
| * | | | | | Fix typo | Bjørn Christian Seime | 2017-10-16 | 1 | -1/+1 |
|/ / / / / |