summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Remove PaathProviderHarald Musum2017-11-178-88/+40
* | | | | Merge pull request #4174 from vespa-engine/revert-3635-bjorncs/disable-faulty...Bjørn Christian Seime2017-11-171-1/+0
|\ \ \ \ \
| * | | | | Revert "Temporarily ignore unstable orchestrator test"Bjørn Christian Seime2017-11-161-1/+0
| | |_|_|/ | |/| | |
* | | | | Merge pull request #4183 from vespa-engine/hmusum/move-java-filedistribution-...Henning Baldersheim2017-11-179-15/+54
|\ \ \ \ \
| * | | | | Move fildistribution code to filedistribution moduleHarald Musum2017-11-179-15/+54
| | |_|/ / | |/| | |
* | | | | Merge pull request #4176 from vespa-engine/jvenstad/deployment-cleanup-part-deuxJon Marius Venstad2017-11-1713-138/+89
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Re-insert negation o_OJon Marius Venstad2017-11-171-1/+1
| * | | | Removed redundant codeJon Marius Venstad2017-11-171-7/+1
| * | | | Reverted the two non-improvementsJon Marius Venstad2017-11-172-9/+15
| * | | | Resolved conflictJon Marius Venstad2017-11-17119-772/+1743
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | More name changesJon Marius Venstad2017-11-165-18/+14
| * | | | Added TODO:Jon Marius Venstad2017-11-153-6/+6
| * | | | More nitpickingJon Marius Venstad2017-11-155-36/+28
| * | | | More reassangement, name changesJon Marius Venstad2017-11-154-54/+24
| * | | | The only job we should trigger, without a zone, is component, on retriesJon Marius Venstad2017-11-151-12/+10
| * | | | Reordering, name changes, inliningJon Marius Venstad2017-11-156-32/+26
* | | | | Merge pull request #4180 from vespa-engine/kkraune/typoLester Solbakken2017-11-172-5/+4
|\ \ \ \ \
| * | | | | rename method, optimize importKristian Aune2017-11-172-5/+4
* | | | | | Merge pull request #4181 from vespa-engine/jvenstad/automated-ownership-issuesJon Bratseth2017-11-172-2/+8
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Added doc and fixed typoJon Marius Venstad2017-11-172-2/+8
* | | | | | Merge pull request #4179 from vespa-engine/hmusum/dont-depend-on-filedistribu...Henning Baldersheim2017-11-172-10/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Remove unnecessary dependency on filedistributionHarald Musum2017-11-172-10/+0
* | | | | | Merge pull request #4166 from vespa-engine/jvenstad/automated-ownership-issuesJon Bratseth2017-11-1713-30/+325
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Fixed conflictJon Marius Venstad2017-11-16145-1083/+1795
| |\ \ \ \
| * | | | | Maintainer which asks for regular confirmation of ownershipJon Marius Venstad2017-11-1613-29/+324
* | | | | | Merge pull request #4156 from vespa-engine/bjorncs/athenz-ssl-keystore-config...Morten Tokle2017-11-172-0/+126
|\ \ \ \ \ \
| * | | | | | Verify actual expiryBjørn Christian Seime2017-11-161-0/+12
| * | | | | | Reduce update frequencyBjørn Christian Seime2017-11-161-1/+2
| * | | | | | Disable Athenz ssl keystore configurator in mainBjørn Christian Seime2017-11-161-0/+7
| * | | | | | Add Athenz implementation of SslKeyStoreConfiguratorBjørn Christian Seime2017-11-162-0/+106
* | | | | | | Merge pull request #4177 from vespa-engine/revert-4175-revert-4162-revert-414...Harald Musum2017-11-1610-156/+15
|\ \ \ \ \ \ \
| * | | | | | | Revert "Revert "Revert "Hmusum/move new filedistribution classes"""Harald Musum2017-11-1610-156/+15
|/ / / / / / /
* | | | | | | Merge pull request #4175 from vespa-engine/revert-4162-revert-4140-hmusum/mov...Jon Marius Venstad2017-11-1610-15/+156
|\ \ \ \ \ \ \
| * | | | | | | Revert "Revert "Hmusum/move new filedistribution classes""Harald Musum2017-11-1610-15/+156
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #4145 from vespa-engine/mortent/add-lbaddress-nameMorten Tokle2017-11-1611-46/+121
|\ \ \ \ \ \ \
| * | | | | | | Add new field for loadbalancername, deprecate loadbalanceraddressMorten Tokle2017-11-1511-46/+121
* | | | | | | | Merge pull request #4173 from vespa-engine/bjorncs/human-friendly-timestampMorten Tokle2017-11-162-0/+8
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Also log timestamp in human-friendly formatBjørn Christian Seime2017-11-162-0/+8
* | | | | | | | Merge pull request #4172 from vespa-engine/toregge/remove-unused-maintenance-...Geir Storli2017-11-164-62/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove unused class MaintenanceBucket.Tor Egge2017-11-164-62/+1
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #4169 from vespa-engine/hmusum/dont-depend-on-filedistribu...gjoranv2017-11-161-5/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Don't depend on filedistributionHarald Musum2017-11-161-5/+0
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #4168 from vespa-engine/vekterli/flip-internal-priorities-...Tor Brede Vekterli2017-11-162-5/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Flip internal priorities of GC and move-only mergeTor Brede Vekterli2017-11-162-5/+5
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #4167 from vespa-engine/geirst/prepare-storageapi-protocol...Tor Brede Vekterli2017-11-165-60/+77
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Add API function to encode a bucket space.Geir Storli2017-11-165-0/+10
| * | | | | | | Add API function to encode a bucket.Geir Storli2017-11-165-19/+27
| * | | | | | | Add API function to decode a bucket space to reduce direct use of placeholder...Geir Storli2017-11-165-3/+11
| * | | | | | | Add API function to decode a bucket to reduce direct use of placeholder bucke...Geir Storli2017-11-165-38/+29
* | | | | | | | Merge pull request #4163 from vespa-engine/lesters/enable-tensor-conformance-...Jon Bratseth2017-11-163-36/+50
|\ \ \ \ \ \ \ \