summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [6.170.46-1].vespa-6.170.46-1by-screwdriver2017-11-094-1/+2
* Merge pull request #4032 from vespa-engine/bjorncs/travisArnstein Ressem2017-11-081-1/+1
|\
| * Don't delete com.yahoo.athenz artifactsBjørn Christian Seime2017-11-071-1/+1
* | Merge pull request #4042 from vespa-engine/bratseth/job-run-reason-tweaksJon Bratseth2017-11-089-38/+37
|\ \
| * \ Merge branch 'master' into bratseth/job-run-reason-tweaksJon Bratseth2017-11-0821-64/+289
| |\ \
| * | | Tweak job run reasonsJon Bratseth2017-11-085-33/+30
| * | | Nonfunctional changes onlyJon Bratseth2017-11-084-5/+7
* | | | Merge pull request #4045 from vespa-engine/geirst/reapply-commit-attributes-o...Tor Egge2017-11-082-15/+77
|\ \ \ \ | |_|/ / |/| | |
| * | | Only commit attributes once when handling a batch remove in attribute writer.Geir Storli2017-11-081-3/+41
| * | | Remove unused code.Geir Storli2017-11-081-6/+0
| * | | Add test for batch remove on attribute writer.Geir Storli2017-11-081-6/+36
* | | | Merge pull request #4035 from vespa-engine/hmusum/use-constructor-for-testsJon Bratseth2017-11-082-4/+10
|\ \ \ \
| * \ \ \ Merge branch 'master' into hmusum/use-constructor-for-testsHarald Musum2017-11-0815-91/+217
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Use constructor for tests and make sure it creates system tenantsHarald Musum2017-11-082-4/+10
* | | | | Merge pull request #4040 from vespa-engine/hmusum/make-test-more-robustJon Bratseth2017-11-081-7/+9
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Try to make test more robustHarald Musum2017-11-081-7/+9
| | |/ / | |/| |
* | | | Merge pull request #4041 from vespa-engine/balder/balder/add-filedist-rpc-to-...Harald Musum2017-11-083-21/+78
|\ \ \ \
| * | | | Add a simple Receiver interface so that we can keep the RPC stuff one place a...Henning Baldersheim2017-11-083-21/+78
* | | | | Merge pull request #3954 from vespa-engine/mortent/propagate-lbaddressMorten Tokle2017-11-0810-14/+76
|\ \ \ \ \
| * | | | | Propagate loadBalancerAddressMorten Tokle2017-11-0710-14/+76
* | | | | | Merge pull request #4038 from vespa-engine/jvenstad/disable-unstable-testMartin Polden2017-11-083-4/+5
|\ \ \ \ \ \
| * | | | | | I said I didn't like this code duplication >_<Jon Marius Venstad2017-11-081-2/+1
| * | | | | | Fix is-upgrading conditionJon Marius Venstad2017-11-082-2/+4
* | | | | | | Merge pull request #4043 from vespa-engine/gjoranv/commons-logging-versionBjørn Christian Seime2017-11-082-3/+6
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Move commons-logging version to parent pom.gjoranv2017-11-082-3/+6
* | | | | | | Merge pull request #4039 from vespa-engine/balder/add-filedist-rpc-to-configs...Harald Musum2017-11-083-15/+109
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Add simple test for the FileServer.Henning Baldersheim2017-11-083-15/+109
|/ / / / / /
* | | | | | Merge pull request #4034 from vespa-engine/balder/add-filedist-rpc-to-configs...Harald Musum2017-11-089-15/+144
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into balder/add-filedist-rpc-to-configserverHarald Musum2017-11-0819-199/+139
| |\ \ \ \ \ \
| * | | | | | | Depend on lz4 (for xxhash) and add no-arg FileServer constructorHarald Musum2017-11-082-1/+12
| * | | | | | | Correct the signature.Henning Baldersheim2017-11-071-1/+1
| * | | | | | | Update receiveFile to new signature.Henning Baldersheim2017-11-073-5/+12
| * | | | | | | Add serveFile interface.Henning Baldersheim2017-11-072-0/+59
| * | | | | | | Add serveFile interface.Henning Baldersheim2017-11-077-14/+66
* | | | | | | | Merge pull request #4023 from vespa-engine/hakonhall/remove-redundant-overridesHåkon Hallingstad2017-11-081-15/+2
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Remove redundant overridesHåkon Hallingstad2017-11-071-15/+2
* | | | | | | | Merge pull request #4036 from vespa-engine/bratseth/complete-upgrades-already...Martin Polden2017-11-084-58/+70
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Merge with masterJon Bratseth2017-11-0892-865/+1143
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Complete upgrades which already startedJon Bratseth2017-11-084-58/+70
* | | | | | | | Merge pull request #4037 from vespa-engine/hmusum/remove-duplicate-regionsJon Marius Venstad2017-11-081-3/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Remove duplicate regions in testHarald Musum2017-11-081-3/+1
|/ / / / / / /
* | | | | | | Merge pull request #4026 from vespa-engine/jvenstad/deployment-stuff-cleanupJon Marius Venstad2017-11-0818-196/+138
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Removed unused methodJon Marius Venstad2017-11-071-10/+0
| * | | | | | Reverted fixJon Marius Venstad2017-11-073-6/+11
| * | | | | | Temporary fix for unstable unit testJon Marius Venstad2017-11-073-11/+6
| * | | | | | Name changes, minor refactoring, should be non-functional onlyJon Marius Venstad2017-11-0718-186/+138
* | | | | | | Merge pull request #4022 from vespa-engine/hmusum/filereferences-downloadHenning Baldersheim2017-11-0713-119/+585
|\ \ \ \ \ \ \
| * | | | | | | Fix test to not read from queueHarald Musum2017-11-073-6/+9
| * | | | | | | Add a queue for downloadsHarald Musum2017-11-075-41/+106
| * | | | | | | Synchronize access when making copy in the right placeHarald Musum2017-11-072-3/+3