summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Log defname tooHarald Musum2017-11-221-1/+2
* Merge pull request #4242 from vespa-engine/bratseth/count-prod-onlyMorten Tokle2017-11-222-3/+8
|\
| * Count prod onlyJon Bratseth2017-11-222-3/+8
* | Merge pull request #4243 from vespa-engine/bjorncs/test-serializationValerij Fredriksen2017-11-221-0/+32
|\ \ | |/ |/|
| * Add unit test for CsrSerializedPayload deserializationBjørn Christian Seime2017-11-221-0/+32
* | Merge pull request #4239 from vespa-engine/balder/use-c++11-for-loopsHenning Baldersheim2017-11-221-11/+6
|\ \ | |/ |/|
| * Simplify by using c++11 for loops.Henning Baldersheim2017-11-221-11/+6
|/
* Merge pull request #4237 from vespa-engine/hmusum/log-when-config-is-updatedHenning Baldersheim2017-11-221-4/+7
|\
| * Merge branch 'hmusum/log-when-config-is-updated' of github.com:vespa-engine/v...Henning Baldersheim2017-11-220-0/+0
| |\
| | * Make sure to get key before logging itHarald Musum2017-11-221-2/+3
| * | Make it build and simplify with c++ for loops.Henning Baldersheim2017-11-221-5/+7
| |/
| * Log when config is updatedHarald Musum2017-11-221-1/+2
* | Merge pull request #4236 from vespa-engine/bjorncs/move-model-filesBjørn Christian Seime2017-11-223-4/+2
|\ \
| * | Move model types to same package as certificate signer resourceBjørn Christian Seime2017-11-223-4/+2
| |/
* | Merge pull request #4234 from vespa-engine/revert-4227-revert-4226-revert-422...Valerij Fredriksen2017-11-225-93/+12
|\ \ | |/ |/|
| * Revert "Revert "Revert "Add support for downloading from another config serve...Harald Musum2017-11-225-93/+12
|/
* Merge pull request #4227 from vespa-engine/revert-4226-revert-4221-hmusum/dow...Henning Baldersheim2017-11-225-12/+93
|\
| * Use correct versionHarald Musum2017-11-211-1/+1
| * Revert "Revert "Add support for downloading from another config server""Harald Musum2017-11-215-12/+93
* | Merge pull request #4231 from vespa-engine/jvenstad/ignore-PR-app-ownershipJon Bratseth2017-11-221-1/+1
|\ \
| * | Do not send to default-pr applicationsJon Marius Venstad2017-11-211-1/+1
* | | Merge pull request #4233 from vespa-engine/jvenstad/validate-deployment-spec-...Jon Bratseth2017-11-224-6/+20
|\ \ \
| * | | Verify zones before storing anythingJon Marius Venstad2017-11-224-6/+20
* | | | Merge pull request #4232 from vespa-engine/hmusum/ignore-logd-in-config-statusValerij Fredriksen2017-11-221-1/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Ignore logd in vespa-config-statusHarald Musum2017-11-221-1/+2
| | |/ | |/|
* | | Merge pull request #4229 from vespa-engine/jvenstad/increase-ownership-mainte...Jon Bratseth2017-11-211-1/+1
|\ \ \ | |_|/ |/| |
| * | 12 hours instead of 1Jon Marius Venstad2017-11-211-1/+1
|/ /
* | Merge pull request #4228 from vespa-engine/bjorncs/dont-inject-config-to-reso...Bjørn Christian Seime2017-11-217-43/+31
|\ \ | |/ |/|
| * Don't inject config instances into jax-rs resourcesBjørn Christian Seime2017-11-217-43/+31
|/
* Merge pull request #4224 from vespa-engine/arnej/logd-add-state-reporterHarald Musum2017-11-219-7/+90
|\
| * skeleton for state reporting in logdArne Juul2017-11-219-7/+90
* | Merge pull request #4222 from vespa-engine/vekterli/use-content-bucket-space-...Geir Storli2017-11-2111-128/+99
|\ \
| * | Add document::BucketSpace accessor to ContentBucketSpaceTor Brede Vekterli2017-11-214-5/+10
| * | Bind a BucketMover Run to a particular bucket spaceTor Brede Vekterli2017-11-218-124/+90
* | | Merge pull request #4226 from vespa-engine/revert-4221-hmusum/download-from-a...Harald Musum2017-11-215-93/+12
|\ \ \
| * | | Revert "Add support for downloading from another config server"Harald Musum2017-11-215-93/+12
|/ / /
* | | Merge pull request #4219 from vespa-engine/toregge/use-content-bucket-space-t...Geir Storli2017-11-212-20/+30
|\ \ \
| * | | Use ContentBucketSpace to get Distribution in ChangedBucketOwnershipHandler.Tor Egge2017-11-212-20/+30
* | | | Merge pull request #4217 from vespa-engine/toregge/use-content-bucket-space-t...Geir Storli2017-11-211-1/+3
|\ \ \ \
| * | | | Use ContentBucketSpace to get Distribution.Tor Egge2017-11-211-1/+3
| |/ / /
* | | | Merge pull request #4214 from vespa-engine/toregge/use-content-bucket-space-t...Geir Storli2017-11-214-10/+12
|\ \ \ \
| * | | | Reduce number of additional lock operations at startup.Tor Egge2017-11-212-6/+7
| * | | | Use ContentBucketSpace to get Distribution.Tor Egge2017-11-214-9/+10
| | |_|/ | |/| |
* | | | Merge pull request #4221 from vespa-engine/hmusum/download-from-another-confi...Henning Baldersheim2017-11-215-12/+93
|\ \ \ \
| * | | | Add support for downloading from another config serverHarald Musum2017-11-215-12/+93
* | | | | Merge pull request #4220 from vespa-engine/hmusum/do-not-remove-from-queue-wh...Henning Baldersheim2017-11-212-9/+12
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Do not remove from queue when cancellingHarald Musum2017-11-212-9/+12
| |/ / /
* | | | Merge pull request #4211 from vespa-engine/jvenstad/application-locking-revisedJon Marius Venstad2017-11-2116-240/+208
|\ \ \ \
| * \ \ \ Merge branch 'master' into jvenstad/application-locking-revisedJon Marius Venstad2017-11-2150-153/+701
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #4218 from vespa-engine/bratseth/nonfunctional-cgangesJon Marius Venstad2017-11-214-6/+15
|\ \ \ \ \