summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Adjust build setup for Darwin.Tor Egge2019-03-147-6/+26
|
* Merge pull request #8790 from vespa-engine/bratseth/increase-timeoutHenning Baldersheim2019-03-143-70/+97
|\ | | | | Increase timeout MERGEOK
| * Increase timeoutJon Bratseth2019-03-143-70/+97
|/
* Merge pull request #8787 from vespa-engine/bjorncs/jdisc-connector-configHenning Baldersheim2019-03-142-0/+6
|\ | | | | Add back stopTimeout to connector config
| * Add back stopTimeout to connector configBjørn Christian Seime2019-03-142-0/+6
| |
* | Merge pull request #8779 from ↵Valerij Fredriksen2019-03-1443-163/+197
|\ \ | | | | | | | | | | | | vespa-engine/freva/use-config-provisioning-docker-image Use config-provisioning DockerImage
| * | Update Version and DockerImage at the same timeValerij Fredriksen2019-03-134-7/+13
| | |
| * | Use config-provisioning VersionValerij Fredriksen2019-03-135-42/+43
| | |
| * | Use config-provisioning DockerImageValerij Fredriksen2019-03-1329-48/+54
| | |
| * | Use config-provisioning DockerImage in docker-apiValerij Fredriksen2019-03-1310-52/+24
| | |
| * | Fix DockerImageValerij Fredriksen2019-03-132-14/+63
| | |
* | | Merge pull request #8777 from ↵Bjørn Christian Seime2019-03-1438-539/+486
|\ \ \ | | | | | | | | | | | | | | | | vespa-engine/gjoranv/container-cluster-implementations-rebased Gjoranv/container cluster implementations
| * | | Use single binding with '*' as scheme.gjoranv2019-03-131-1/+1
| | | |
| * | | Rename myPrepare -> doPreparegjoranv2019-03-134-5/+6
| | | |
| * | | Rename Container(Cluster)Impl -> ApplicationContainer(Cluster)gjoranv2019-03-1326-182/+159
| | | |
| * | | Simplify setup of default handlers.gjoranv2019-03-138-36/+24
| | | |
| * | | Add class for LogserverContainerClustergjoranv2019-03-133-4/+25
| | | |
| * | | Use explicit type for implicit indexing cluster.gjoranv2019-03-131-5/+5
| | | |
| * | | Set up components depending on cluster type.gjoranv2019-03-1310-184/+17
| | | | | | | | | | | | | | | | | | | | - Remove ClusterVerifier, it's no longer needed. - Remove tests that are no longer relevant.
| * | | Separate between ContainerCluster types.gjoranv2019-03-1334-304/+402
| | | | | | | | | | | | | | | | | | | | | | | | - Add type parameter for ContainerCluster - Add concrete type for app clusters (CCImpl) and clustercontroller clusters (ClusterControllerCC)
| * | | Make ContainerCluster abstract.gjoranv2019-03-139-36/+65
| |/ /
* | | Merge pull request #8785 from ↵Tor Egge2019-03-143-12/+3
|\ \ \ | | | | | | | | | | | | | | | | vespa-engine/toregge/remove-bad-format-string-macro-hack-try-2 Remove bad format string macro hack.
| * | | cinttypes must be included before Jydy.h.Tor Egge2019-03-131-0/+1
| | | |
| * | | Remove bad format string macro hack.Tor Egge2019-03-132-12/+2
|/ / /
* | | Merge pull request #8784 from vespa-engine/toregge/stop-naming-method-ntohllHenning Baldersheim2019-03-131-4/+4
|\ \ \ | | | | | | | | Stop naming private method ntohll.
| * | | Stop naming private method ntohll.Tor Egge2019-03-131-4/+4
| | |/ | |/|
* | | Merge pull request #8783 from ↵Tor Egge2019-03-132-2/+12
|\ \ \ | | | | | | | | | | | | | | | | vespa-engine/revert-8780-toregge/remove-bad-format-string-macro-hack Revert "Remove bad format string macro hack."
| * | | Revert "Remove bad format string macro hack."Arnstein Ressem2019-03-132-2/+12
| | | |
* | | | Merge pull request #8781 from vespa-engine/toregge/fix-format-strings-6Henning Baldersheim2019-03-1311-29/+31
|\ \ \ \ | |/ / / |/| | | Fix format strings in searchcorespi, fastlib, storageframework, vespalib and streamingvisitors module.
| * | | Fix format string in streamingvisitors module.Tor Egge2019-03-131-1/+1
| | | |
| * | | Fix format strings in vespalib module.Tor Egge2019-03-136-23/+24
| | | |
| * | | Fix format string in storageframework module.Tor Egge2019-03-131-2/+2
| | | |
| * | | Fix format string in fastlib module.Tor Egge2019-03-131-1/+2
| | | |
| * | | Fix format strings in searchcorespi module.Tor Egge2019-03-132-2/+2
| |/ /
* | | Merge pull request #8782 from vespa-engine/toregge/trim-down-vespalib-regexpHenning Baldersheim2019-03-133-40/+0
|\ \ \ | | | | | | | | Remove unused vespalib::Regexp::replace() method.
| * | | Remove unused vespalib::Regexp::replace() method.Tor Egge2019-03-133-40/+0
| |/ /
* | | Merge pull request #8780 from ↵Henning Baldersheim2019-03-132-12/+2
|\ \ \ | | | | | | | | | | | | | | | | vespa-engine/toregge/remove-bad-format-string-macro-hack Remove bad format string macro hack.
| * | | Remove bad format string macro hack.Tor Egge2019-03-132-12/+2
| |/ /
* | | Merge pull request #8771 from vespa-engine/balder/lazy-traceHenning Baldersheim2019-03-138-40/+79
|\ \ \ | |/ / |/| | Make the Trace object itself lazy
| * | Move control of tracelevel to matchengine.Henning Baldersheim2019-03-133-12/+11
| | |
| * | Make it lazy and safe.Henning Baldersheim2019-03-136-44/+46
| | |
| * | Make the Trace object itself lazyHenning Baldersheim2019-03-138-35/+73
| | | | | | | | | | | | Make start optional and explicit.
* | | Merge pull request #8778 from vespa-engine/bjorncs/jetty-graceful-shutdownBjørn Christian Seime2019-03-136-14/+14
|\ \ \ | | | | | | | | Bjorncs/jetty graceful shutdown
| * | | Replace use of Guava with standard libraryBjørn Christian Seime2019-03-131-7/+2
| | | |
| * | | Print shutdown timeoutBjørn Christian Seime2019-03-131-1/+1
| | | |
| * | | Remove stopTimeout from connector configBjørn Christian Seime2019-03-134-9/+1
| | | | | | | | | | | | | | | | Use global stop timeout from server on all connectors
| * | | Add logging of server shutdownBjørn Christian Seime2019-03-131-0/+6
| | | |
| * | | Add stop timeout to server configBjørn Christian Seime2019-03-134-2/+9
| | | |
* | | | Merge pull request #8776 from ↵Geir Storli2019-03-135-45/+101
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | vespa-engine/toregge/prepare-for-dynamic-cluster-size-in-dense-tensor-store Prepare for dynamic cluster size in dense tensor store.
| * | | | Shorten name: isAlignedEntryRefType -> isAlignedType.Tor Egge2019-03-132-3/+3
| | | | |