summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [6.173.62-1].vespa-6.173.62-1by-screwdriver2017-11-164-1/+2
* Merge pull request #4142 from vespa-engine/revert-4127-bratseth/remove-trigge...Martin Polden2017-11-1513-77/+224
|\
| * Revert "Remove redundant logic"Harald Musum2017-11-1513-77/+224
|/
* Merge pull request #4139 from vespa-engine/bjorncs/stop-logging-harmless-exce...Bjørn Christian Seime2017-11-151-1/+6
|\
| * Don't log org.eclipse.jetty.io.EofException as warningBjørn Christian Seime2017-11-151-1/+6
* | Merge pull request #4137 from vespa-engine/jvenstad/minor-bug-squashJon Marius Venstad2017-11-151-16/+3
|\ \
| * | Restore condition to its intention, without the redundant partJon Marius Venstad2017-11-151-14/+1
| * | Avoid potential NPEs and fix a conditionJon Marius Venstad2017-11-151-3/+3
* | | Merge pull request #4128 from vespa-engine/hakonhall/print-exception-since-lo...gjoranv2017-11-151-0/+2
|\ \ \ | |_|/ |/| |
| * | Print exception since logging may not have been setupHåkon Hallingstad2017-11-141-0/+2
* | | Merge pull request #4134 from vespa-engine/bjorncs/port-scheme-access-loggingBjørn Christian Seime2017-11-154-5/+47
|\ \ \
| * | | Add 'secure' and 'local-port' to JSON access logBjørn Christian Seime2017-11-154-5/+47
* | | | Merge pull request #4138 from vespa-engine/hmusum/remove-minSlobroksPerClusterHåkon Hallingstad2017-11-153-5/+0
|\ \ \ \
| * | | | Remove support for minSlobroksPerClusterHarald Musum2017-11-153-5/+0
| | |_|/ | |/| |
* | | | Merge pull request #4135 from vespa-engine/revert-4130-revert-4125-hmusum/mov...Henning Baldersheim2017-11-158-38/+8
|\ \ \ \
| * | | | Use correct namespaceHarald Musum2017-11-142-3/+3
| * | | | Revert "Revert "Move filedistribution config definitions to configdefinitions...Harald Musum2017-11-146-35/+5
| | |/ / | |/| |
* | | | Merge pull request #4127 from vespa-engine/bratseth/remove-trigger-failedJon Marius Venstad2017-11-1513-224/+77
|\ \ \ \ | |_|/ / |/| | |
| * | | Remove DelayedDeployer as it is covered by ReadyJobsTriggerJon Bratseth2017-11-145-62/+5
| * | | Remove redundant logicJon Bratseth2017-11-1412-163/+73
* | | | Merge pull request #4136 from vespa-engine/revert-4120-mortent/treat-lbaddres...Harald Musum2017-11-149-44/+39
|\ \ \ \
| * | | | Revert "Treat loadbalancer address as string and pass through"Harald Musum2017-11-149-44/+39
|/ / / /
* | | | Merge pull request #4109 from vespa-engine/jvenstad/recursive-application-apiJon Bratseth2017-11-1416-119/+458
|\ \ \ \ | |_|/ / |/| | |
| * | | Fixed more responses"Jon Marius Venstad2017-11-142-1/+2
| * | | Use @include and list self-info in tenant and application blobsJon Marius Venstad2017-11-1415-640/+136
| * | | Test recursive responses at tenant and application level as wellJon Marius Venstad2017-11-143-0/+530
| * | | Added tenant name to recursive root response, moved stuff, and testJon Marius Venstad2017-11-143-39/+349
| * | | Moved stuff around, and special behaviour for "recursive=true"Jon Marius Venstad2017-11-143-81/+83
* | | | Merge pull request #4130 from vespa-engine/revert-4125-hmusum/move-filedistri...Henning Baldersheim2017-11-146-5/+35
|\ \ \ \
| * | | | Revert "Move filedistribution config definitions to configdefinitions module"Harald Musum2017-11-146-5/+35
|/ / / /
* | | | Merge pull request #4129 from vespa-engine/havardpe/avoid-premature-iterator-...Henning Baldersheim2017-11-142-22/+5
|\ \ \ \
| * | | | we need to keep all iterators to handle additional rangesHåvard Pettersen2017-11-142-22/+5
* | | | | Merge pull request #4125 from vespa-engine/hmusum/move-filedistribution-confi...Henning Baldersheim2017-11-146-35/+5
|\ \ \ \ \
| * | | | | def files have been movedHarald Musum2017-11-142-5/+1
| * | | | | Move filedistribution config definitions to configdefinitions moduleHarald Musum2017-11-144-30/+4
* | | | | | Merge pull request #4113 from vespa-engine/toregge/use-std-mutex-in-searchcor...Geir Storli2017-11-142-34/+35
|\ \ \ \ \ \
| * | | | | | Use std::lock_guard and scopes instead of std::unique_lock.Tor Egge2017-11-141-14/+17
| * | | | | | Use std::mutex in searchore PersistenceEngine.Tor Egge2017-11-142-23/+21
* | | | | | | Merge pull request #4117 from vespa-engine/toregge/propagate-bucket-space-to-...Geir Storli2017-11-146-23/+26
|\ \ \ \ \ \ \
| * | | | | | | Supply bucket space to operation target resolver implementation and propagateTor Egge2017-11-146-23/+26
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #4123 from vespa-engine/toregge/consolidate-makebucketspac...Geir Storli2017-11-1414-39/+38
|\ \ \ \ \ \ \
| * | | | | | | Consolidate makeBucketSpace() test functions to document module.Tor Egge2017-11-1414-39/+38
* | | | | | | | Merge pull request #4120 from vespa-engine/mortent/treat-lbaddress-asstringBjørn Christian Seime2017-11-149-39/+44
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Treat loadbalancer address as string and pass throughMorten Tokle2017-11-149-39/+44
* | | | | | | | Merge pull request #4124 from vespa-engine/balder/add-chunked-file-rpc-skelet...Henning Baldersheim2017-11-141-6/+45
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | part-id not needed in eof method.Henning Baldersheim2017-11-141-5/+4
| * | | | | | | Add receive files chunked skeleton.Henning Baldersheim2017-11-141-6/+46
|/ / / / / / /
* | | | | | | Merge pull request #4121 from vespa-engine/hmusum/validate-xxhash-when-receiv...Henning Baldersheim2017-11-144-9/+27
|\ \ \ \ \ \ \
| * | | | | | | Validate xxhash when receiving fileHarald Musum2017-11-144-9/+27
* | | | | | | | Merge pull request #4116 from vespa-engine/balder/simplify-and-always-hold-lo...Henning Baldersheim2017-11-141-15/+6
|\ \ \ \ \ \ \ \