Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Automatic commit of package [vespa] release [6.170.46-1].vespa-6.170.46-1 | by-screwdriver | 2017-11-09 | 4 | -1/+2 |
* | Merge pull request #4032 from vespa-engine/bjorncs/travis | Arnstein Ressem | 2017-11-08 | 1 | -1/+1 |
|\ | |||||
| * | Don't delete com.yahoo.athenz artifacts | Bjørn Christian Seime | 2017-11-07 | 1 | -1/+1 |
* | | Merge pull request #4042 from vespa-engine/bratseth/job-run-reason-tweaks | Jon Bratseth | 2017-11-08 | 9 | -38/+37 |
|\ \ | |||||
| * \ | Merge branch 'master' into bratseth/job-run-reason-tweaks | Jon Bratseth | 2017-11-08 | 21 | -64/+289 |
| |\ \ | |||||
| * | | | Tweak job run reasons | Jon Bratseth | 2017-11-08 | 5 | -33/+30 |
| * | | | Nonfunctional changes only | Jon Bratseth | 2017-11-08 | 4 | -5/+7 |
* | | | | Merge pull request #4045 from vespa-engine/geirst/reapply-commit-attributes-o... | Tor Egge | 2017-11-08 | 2 | -15/+77 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Only commit attributes once when handling a batch remove in attribute writer. | Geir Storli | 2017-11-08 | 1 | -3/+41 |
| * | | | Remove unused code. | Geir Storli | 2017-11-08 | 1 | -6/+0 |
| * | | | Add test for batch remove on attribute writer. | Geir Storli | 2017-11-08 | 1 | -6/+36 |
* | | | | Merge pull request #4035 from vespa-engine/hmusum/use-constructor-for-tests | Jon Bratseth | 2017-11-08 | 2 | -4/+10 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' into hmusum/use-constructor-for-tests | Harald Musum | 2017-11-08 | 15 | -91/+217 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | Use constructor for tests and make sure it creates system tenants | Harald Musum | 2017-11-08 | 2 | -4/+10 |
* | | | | | Merge pull request #4040 from vespa-engine/hmusum/make-test-more-robust | Jon Bratseth | 2017-11-08 | 1 | -7/+9 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Try to make test more robust | Harald Musum | 2017-11-08 | 1 | -7/+9 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #4041 from vespa-engine/balder/balder/add-filedist-rpc-to-... | Harald Musum | 2017-11-08 | 3 | -21/+78 |
|\ \ \ \ | |||||
| * | | | | Add a simple Receiver interface so that we can keep the RPC stuff one place a... | Henning Baldersheim | 2017-11-08 | 3 | -21/+78 |
* | | | | | Merge pull request #3954 from vespa-engine/mortent/propagate-lbaddress | Morten Tokle | 2017-11-08 | 10 | -14/+76 |
|\ \ \ \ \ | |||||
| * | | | | | Propagate loadBalancerAddress | Morten Tokle | 2017-11-07 | 10 | -14/+76 |
* | | | | | | Merge pull request #4038 from vespa-engine/jvenstad/disable-unstable-test | Martin Polden | 2017-11-08 | 3 | -4/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | I said I didn't like this code duplication >_< | Jon Marius Venstad | 2017-11-08 | 1 | -2/+1 |
| * | | | | | | Fix is-upgrading condition | Jon Marius Venstad | 2017-11-08 | 2 | -2/+4 |
* | | | | | | | Merge pull request #4043 from vespa-engine/gjoranv/commons-logging-version | Bjørn Christian Seime | 2017-11-08 | 2 | -3/+6 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Move commons-logging version to parent pom. | gjoranv | 2017-11-08 | 2 | -3/+6 |
* | | | | | | | Merge pull request #4039 from vespa-engine/balder/add-filedist-rpc-to-configs... | Harald Musum | 2017-11-08 | 3 | -15/+109 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Add simple test for the FileServer. | Henning Baldersheim | 2017-11-08 | 3 | -15/+109 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #4034 from vespa-engine/balder/add-filedist-rpc-to-configs... | Harald Musum | 2017-11-08 | 9 | -15/+144 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into balder/add-filedist-rpc-to-configserver | Harald Musum | 2017-11-08 | 19 | -199/+139 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Depend on lz4 (for xxhash) and add no-arg FileServer constructor | Harald Musum | 2017-11-08 | 2 | -1/+12 |
| * | | | | | | | Correct the signature. | Henning Baldersheim | 2017-11-07 | 1 | -1/+1 |
| * | | | | | | | Update receiveFile to new signature. | Henning Baldersheim | 2017-11-07 | 3 | -5/+12 |
| * | | | | | | | Add serveFile interface. | Henning Baldersheim | 2017-11-07 | 2 | -0/+59 |
| * | | | | | | | Add serveFile interface. | Henning Baldersheim | 2017-11-07 | 7 | -14/+66 |
* | | | | | | | | Merge pull request #4023 from vespa-engine/hakonhall/remove-redundant-overrides | Håkon Hallingstad | 2017-11-08 | 1 | -15/+2 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | Remove redundant overrides | Håkon Hallingstad | 2017-11-07 | 1 | -15/+2 |
* | | | | | | | | Merge pull request #4036 from vespa-engine/bratseth/complete-upgrades-already... | Martin Polden | 2017-11-08 | 4 | -58/+70 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Merge with master | Jon Bratseth | 2017-11-08 | 92 | -865/+1143 |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | |||||
| * | | | | | | | Complete upgrades which already started | Jon Bratseth | 2017-11-08 | 4 | -58/+70 |
* | | | | | | | | Merge pull request #4037 from vespa-engine/hmusum/remove-duplicate-regions | Jon Marius Venstad | 2017-11-08 | 1 | -3/+1 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Remove duplicate regions in test | Harald Musum | 2017-11-08 | 1 | -3/+1 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #4026 from vespa-engine/jvenstad/deployment-stuff-cleanup | Jon Marius Venstad | 2017-11-08 | 18 | -196/+138 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Removed unused method | Jon Marius Venstad | 2017-11-07 | 1 | -10/+0 |
| * | | | | | | Reverted fix | Jon Marius Venstad | 2017-11-07 | 3 | -6/+11 |
| * | | | | | | Temporary fix for unstable unit test | Jon Marius Venstad | 2017-11-07 | 3 | -11/+6 |
| * | | | | | | Name changes, minor refactoring, should be non-functional only | Jon Marius Venstad | 2017-11-07 | 18 | -186/+138 |
* | | | | | | | Merge pull request #4022 from vespa-engine/hmusum/filereferences-download | Henning Baldersheim | 2017-11-07 | 13 | -119/+585 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix test to not read from queue | Harald Musum | 2017-11-07 | 3 | -6/+9 |
| * | | | | | | | Add a queue for downloads | Harald Musum | 2017-11-07 | 5 | -41/+106 |
| * | | | | | | | Synchronize access when making copy in the right place | Harald Musum | 2017-11-07 | 2 | -3/+3 |