aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* some more cleanupArne Juul2018-06-2032-67/+47
* move LOG_SETUP after other includesArne Juul2018-06-2094-228/+253
* add and use HDR_ABORT insteadArne Juul2018-06-2020-35/+87
* Merge branch 'master' into arnej/use-log-abortArne Juul2018-06-20428-4821/+8601
|\
| * Merge pull request #6241 from vespa-engine/jvenstad/deployment-pipelineJon Marius Venstad2018-06-2059-259/+644
| |\
| | * Move files to correct moduleJon Marius Venstad2018-06-202-4/+5
| | * Revert "Revert "Jvenstad/hosted vespa deployment pipeline""Jon Marius Venstad2018-06-2059-259/+643
| |/
| * Merge pull request #6240 from vespa-engine/revert-6234-jvenstad/hosted-vespa-...Henning Baldersheim2018-06-1959-643/+259
| |\
| | * Revert "Jvenstad/hosted vespa deployment pipeline"Harald Musum2018-06-1959-643/+259
| * | Merge pull request #6239 from vespa-engine/geirst/reduce-feeding-concurrency-...Henning Baldersheim2018-06-191-1/+1
| |\ \ | | |/ | |/|
| | * Reduce default feeding.concurrency from 0.5 to 0.2.Geir Storli2018-06-191-1/+1
| * | Merge pull request #6233 from vespa-engine/vekterli/debug-log-when-config-is-...Geir Storli2018-06-191-26/+29
| |\ \ | | |/ | |/|
| | * Debug log when new config is received on content nodeTor Brede Vekterli2018-06-191-26/+29
| * | Merge pull request #6238 from vespa-engine/arnej/handle-twitter-loggingJon Bratseth2018-06-191-5/+15
| |\ \
| | * | translate any unknown log levels numerically (some customers chose to useArne Juul2018-06-191-5/+15
| * | | Merge pull request #6236 from vespa-engine/bjorncs/pom-fixgjoranv2018-06-191-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Fix warningBjørn Christian Seime2018-06-191-1/+1
| * | | Merge pull request #6234 from vespa-engine/jvenstad/hosted-vespa-deployment-p...Jon Marius Venstad2018-06-1959-259/+643
| |\ \ \
| | * | | Changed some types, added some docJon Marius Venstad2018-06-197-18/+65
| | * | | Forget-me-notJon Marius Venstad2018-06-191-0/+17
| | * | | I'm a skeletonJon Marius Venstad2018-06-1958-259/+579
| * | | | Merge pull request #6235 from vespa-engine/geirst/support-attribute-settings-...Henning Baldersheim2018-06-199-21/+36
| |\ \ \ \
| | * | | | Support attribute settings (etc. fast-search) for struct field attributes.Geir Storli2018-06-199-21/+36
| * | | | | Merge pull request #6227 from vespa-engine/arnej/last-summary-overrides-olderJon Bratseth2018-06-193-9/+43
| |\ \ \ \ \
| | * | | | | add summaries at start of list insteadArne Juul2018-06-193-10/+42
| | * | | | | let last fetched summary overrideArne Juul2018-06-191-6/+8
| * | | | | | Merge pull request #6230 from vespa-engine/mpolden/only-check-active-and-rese...Martin Polden2018-06-195-35/+30
| |\ \ \ \ \ \
| | * | | | | | Only consider nodes in states active and reservedMartin Polden2018-06-195-35/+30
| * | | | | | | Merge pull request #6232 from vespa-engine/lesters/macro-inlining-in-macrosJon Bratseth2018-06-192-44/+90
| |\ \ \ \ \ \ \
| | * | | | | | | Inline macros in macros, not just first or second phase top levelLester Solbakken2018-06-192-44/+90
| |/ / / / / / /
| * | | | | | | Merge pull request #6231 from vespa-engine/bratseth/reuse-allocation-decisionJon Bratseth2018-06-192-1/+12
| |\ \ \ \ \ \ \
| | * | | | | | | Reuse allocation decisionsJon Bratseth2018-06-192-1/+12
| * | | | | | | | Merge pull request #6228 from vespa-engine/bratseth/nonfunctional-changesgjoranv2018-06-1910-11/+17
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Nonfunctional changes onlyJon Bratseth2018-06-1910-11/+17
| | |/ / / / / / /
| * | | | | | | | Merge pull request #6229 from vespa-engine/hmusum/fix-hash-calculation-for-dirsValerij Fredriksen2018-06-193-14/+22
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | Fix hash calculation for directory file referencesHarald Musum2018-06-193-14/+22
| * | | | | | | | Merge pull request #6225 from vespa-engine/hmusum/run-tenants-maintainer-in-a...Martin Polden2018-06-191-12/+1
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | Run TenantsMaintainer in all zonesHarald Musum2018-06-191-12/+1
| | |/ / / / / /
| * | | | | | | Merge pull request #6226 from vespa-engine/hmusum/use-immutable-setHarald Musum2018-06-192-16/+7
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Use an immutable set instead of synchronized on parameterHarald Musum2018-06-192-16/+7
| |/ / / / / /
| * | | | | | Merge pull request #6224 from vespa-engine/hmusum/use-injected-configserverdbJon Bratseth2018-06-186-6/+19
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Use injected ConfigServerDBHarald Musum2018-06-186-6/+19
| |/ / / / /
| * | | | | Merge pull request #6223 from jefimm/patch-2Jon Bratseth2018-06-181-1/+1
| |\ \ \ \ \
| | * | | | | make function publicJefim Matskin2018-06-181-1/+1
| |/ / / / /
| * | | | | Merge pull request #6219 from vespa-engine/balder/use-single-precomputed-hashmapHenning Baldersheim2018-06-1815-112/+133
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Add missing ')'Henning Baldersheim2018-06-181-1/+1
| | * | | | Add test for getNamePrefixHenning Baldersheim2018-06-181-2/+19
| | * | | | Use correct prefix name when selecting executor.Henning Baldersheim2018-06-173-9/+4
| | * | | | - Remove the execute(string, ...) and force the use of ExecutorId.Henning Baldersheim2018-06-1710-75/+59
| | * | | | Rewrite test to enure AttributeWriter is given a fully populated AttributeMan...Henning Baldersheim2018-06-172-26/+31