summaryrefslogtreecommitdiffstats
path: root/config-model
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #9656 from vespa-engine/gjoranv/use-correct-cluster-typegjoranv2019-06-051-3/+5
|\
| * Use Correct cluster type, and add a TODO.gjoranv2019-06-031-3/+5
* | Merge pull request #9668 from vespa-engine/freva/add-tenant-host-applicationValerij Fredriksen2019-06-041-1/+1
|\ \
| * | Comment zone-app specific code that should be removed after the migrationValerij Fredriksen2019-06-041-1/+1
* | | Only warn when surely preventing a validation failureJon Bratseth2019-06-041-4/+5
|/ /
* / Revert "Remove dispatch-with-protobuf"Harald Musum2019-06-032-0/+5
|/
* Remove dispatch-with-protobufOlli Virtanen2019-06-032-5/+0
* Merge pull request #9641 from vespa-engine/bratseth/ranking-expression-modelsJon Bratseth2019-06-025-1/+120
|\
| * Vespa global model importJon Bratseth2019-06-025-1/+120
* | Merge pull request #9637 from vespa-engine/gjoranv/add-http-metrics-handlergjoranv2019-06-011-0/+14
|\ \
| * | Add metrics request handler to metricsproxy.gjoranv2019-05-311-0/+14
| |/
* | Merge pull request #9614 from vespa-engine/ogronnesby/rotations-in-deployment...Martin Polden2019-05-312-0/+21
|\ \ | |/ |/|
| * Require at least one <endpoint> inside of <endpoints>Øyvind Grønnesby2019-05-311-2/+1
| * Add 'endpoints' tags to the RelaxNG schemaØyvind Grønnesby2019-05-292-0/+22
* | Merge pull request #9610 from vespa-engine/revert-9602-revert-9501-gjoranv/sw...gjoranv2019-05-307-30/+37
|\ \
| * | Revert "Revert "Switch to new metrics proxy." MERGEOK"gjoranv2019-05-297-30/+37
* | | Simplify by using the existing struct builders.gjoranv2019-05-291-10/+4
* | | Disable verbose gc for metricsproxy containers.gjoranv2019-05-293-1/+26
|/ /
* / Prepare metricsproxy container cluster to produce app metadatagjoranv2019-05-294-5/+27
|/
* Revert "Switch to new metrics proxy."gjoranv2019-05-297-37/+30
* Merge pull request #9501 from vespa-engine/gjoranv/switch-to-new-metricsproxygjoranv2019-05-287-30/+37
|\
| * Revert "Always return true for feature flag for new metrics proxy."gjoranv2019-05-234-1/+16
| * Always return true for feature flag for new metrics proxy.gjoranv2019-05-234-16/+1
| * Enable new metrics proxy.gjoranv2019-05-237-30/+37
* | Merge pull request #9586 from vespa-engine/bratseth/default-node-capacityJon Bratseth2019-05-285-44/+11
|\ \
| * | Remove default flavorsJon Bratseth2019-05-283-28/+0
| * | Use docker and node resources in more testsJon Bratseth2019-05-282-16/+11
* | | Merge pull request #9578 from vespa-engine/hmusum/ignore-deployment-xml-in-un...Harald Musum2019-05-283-1/+10
|\ \ \
| * | | Remove commentHarald Musum2019-05-281-1/+0
| * | | Ignore deployment.xml in some contexts (e.g. unit tests)Harald Musum2019-05-273-1/+11
| |/ /
* / / Add validation override for access controlHarald Musum2019-05-272-5/+25
|/ /
* | Log validation override deactivation to deploy logJon Bratseth2019-05-271-1/+1
* | Merge pull request #9520 from vespa-engine/bratseth/uri-in-yqlJon Bratseth2019-05-261-10/+8
|\ \
| * | Support URI matching in YQLJon Bratseth2019-05-231-10/+8
| |/
* | Add cpu.vcpus to SystemMetricsValerij Fredriksen2019-05-241-0/+2
* | Set heap size for metricsproxy containers.gjoranv2019-05-233-3/+14
* | Set jvm related methods final, not intended for overriding.gjoranv2019-05-231-3/+3
* | Merge branch 'master' into bratseth/test-cd-allocation-take-2Jon Bratseth2019-05-221-1/+3
|\|
| * Add Vespa 8 TODOsgjoranv2019-05-221-1/+3
* | Make javadoc markup xhtml compliantJon Bratseth2019-05-221-1/+1
* | Revert "Merge pull request #9485 from vespa-engine/revert-9476-bratseth/test-...Jon Bratseth2019-05-222-6/+4
|/
* Revert "Add some tests and nonfunctional cleanup."Harald Musum2019-05-222-4/+6
* Merge pull request #9482 from vespa-engine/gjoranv/admin-rpc-for-metricsproxygjoranv2019-05-225-17/+33
|\
| * Add TODO to move mbus related stuff to AppContainerCluster.gjoranv2019-05-221-0/+2
| * Enable admin rpc server on metricsproxy containers.gjoranv2019-05-224-17/+31
* | Merge pull request #9476 from vespa-engine/bratseth/test-cd-allocationJon Bratseth2019-05-222-6/+4
|\ \ | |/ |/|
| * Add some tests and nonfunctional cleanupJon Bratseth2019-05-212-6/+4
* | Separate between admin rpc port and messageBus portgjoranv2019-05-215-14/+25
* | minor: imports and comments onlygjoranv2019-05-211-6/+5
|/
* Merge pull request #9450 from vespa-engine/gjoranv/metricsproxy-container-idHarald Musum2019-05-202-2/+2
|\