summaryrefslogtreecommitdiffstats
path: root/config-model
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Revert "Gjoranv/java9 prep 05""gjoranv2018-05-022-7/+7
|
* Revert "Gjoranv/java9 prep 05"gjoranv2018-05-022-7/+7
|
* Merge pull request #5758 from vespa-engine/gjoranv/java9-prep-05gjoranv2018-05-012-7/+7
|\ | | | | Gjoranv/java9 prep 05
| * Java 9: Replace 'new Double' with 'Double.valueOf'gjoranv2018-05-012-3/+3
| |
| * Java 9: Replace 'new Integer' with 'Integer.valueOf'gjoranv2018-04-301-4/+4
| |
* | Merge pull request #5700 from ↵gjoranv2018-04-304-38/+47
|\ \ | |/ |/| | | | | vespa-engine/hmusum/move-rpc-http-messagebus-enabled-flags-to-container-cluster Move flags for rpc, messagebus and http enabled to container cluster
| * Remove duplicated method and move setting of enabled flags for rpc and httpHarald Musum2018-04-302-9/+5
| |
| * Move flags for rpc, messagebus and http enabled to container clusterHarald Musum2018-04-254-33/+46
| |
* | Merge pull request #5747 from ↵Jon Bratseth2018-04-307-7/+117
|\ \ | | | | | | | | | | | | vespa-engine/revert-5744-revert-5715-bratseth/validate-type-removal Revert "Revert "Validate content type removal""
| * | Revert "Revert "Validate content type removal""Jon Bratseth2018-04-307-7/+117
| | |
| * | Revert "Validate content type removal"Jon Marius Venstad2018-04-277-117/+7
| | |
| * | Merge pull request #5715 from vespa-engine/bratseth/validate-type-removalJon Bratseth2018-04-277-7/+117
| |\ \ | | | | | | | | Validate content type removal
| | * | Fix commentsJon Bratseth2018-04-272-3/+3
| | | |
| | * | Validate content type removalJon Bratseth2018-04-267-7/+117
| | | |
* | | | Remove row+column supportJon Bratseth2018-04-271-1/+0
|/ / /
* | | Merge pull request #5729 from ↵Geir Storli2018-04-2710-158/+21
|\ \ \ | | | | | | | | | | | | | | | | vespa-engine/geirst/disallow-importing-fields-of-type-predicate Disallow importing fields of type predicate as this is not (yet) supp…
| * | | Disallow importing fields of type predicate as this is not (yet) supported ↵Geir Storli2018-04-2610-158/+21
| | | | | | | | | | | | | | | | by the search backend.
* | | | Remove disableFiledistributor, temp setting not used anymoreHarald Musum2018-04-272-41/+8
|/ / /
* | | Merge pull request #5708 from vespa-engine/bratseth/select-2-hosts-by-indexJon Bratseth2018-04-262-28/+29
|\ \ \ | |/ / |/| | Select 2 cluster controllers by index
| * | Select 2 cluster controllers by indexJon Bratseth2018-04-252-28/+29
| |/ | | | | | | | | | | | | | | | | This is part of an ongoing effort to move from selecting cluster controllers by hostname to selecting by index - which is more stable given node set changes. We want to make the change in increments of a single node to minimize issues during automatic upgrades.
* | Merge pull request #5710 from vespa-engine/gjoranv/java9-prep-01Bjørn Christian Seime2018-04-251-2/+0
|\ \ | | | | | | Gjoranv/java9 prep 01
| * | Remove explicit maven-compiler-plugin config. Inherit from parent.gjoranv2018-04-251-2/+0
| |/
* | Merge pull request #5680 from ↵Geir Storli2018-04-2514-33/+83
|\ \ | |/ |/| | | | | vespa-engine/geirst/enable-grand-parent-support-in-config-model Geirst/enable grand parent support in config model
| * Extend imported fields test case with field import from grand parent ↵Geir Storli2018-04-239-2/+53
| | | | | | | | document type.
| * Allow importing a field from a parent document type that also is imported.Geir Storli2018-04-235-31/+30
| | | | | | | | This functionality is now supported by the search backend.
* | Merge pull request #5683 from vespa-engine/musum/remove-unused-stuffHenning Baldersheim2018-04-245-58/+19
|\ \ | | | | | | Musum/remove unused stuff
| * | Remove IndexedElasticSearchCluster, all indexed clusters are elasticHarald Musum2018-04-233-37/+14
| | |
| * | Remove unused stuffHarald Musum2018-04-235-21/+5
| |/
* | Remove unused importsLester Solbakken2018-04-231-4/+0
| |
* | Use file distribuition for constant tensors of size 1Lester Solbakken2018-04-231-2/+5
|/
* Better error message when TensorFlow model import failsLester Solbakken2018-04-231-0/+11
|
* Restore createIncomplete - used from standalone-containerJon Bratseth2018-04-221-11/+26
|
* Merge pull request #5639 from ↵Jon Bratseth2018-04-222-38/+26
|\ | | | | | | | | vespa-engine/balder/reduce-memory-footprint-for-rankprofiles Balder/reduce memory footprint for rankprofiles
| * Wire in a StringBuilder to avoid string concatenation.Henning Baldersheim2018-04-202-38/+26
| |
* | Point to the new transport independent metrics.Henning Baldersheim2018-04-211-2/+2
| |
* | Merge pull request #5636 from ↵Harald Musum2018-04-195-6/+31
|\ \ | | | | | | | | | | | | vespa-engine/bratseth/load-models-in-use-only-in-dev Load the minimal set of models needed in dev
| * | Load the minimal set of models needed in devJon Bratseth2018-04-195-6/+31
| |/
* / Move identity provider client to new Java packageBjørn Christian Seime2018-04-181-1/+1
|/
* Merge pull request #5591 from ↵Arne H Juul2018-04-171-2/+2
|\ | | | | | | | | vespa-engine/arnej/handle-new-varname-for-configservers handle VESPA_CONFIGSERVERS
| * handle VESPA_CONFIGSERVERSArne Juul2018-04-161-2/+2
| | | | | | | | | | | | | | | | * also some refactoring * also, make C++ code (in defaults) handle same variable variants, like services__addr_configserver * also, update some error messages to indicate that VESPA_CONFIGSERVERS is the variable we expected to use
* | Merge with masterJon Bratseth2018-04-172-42/+108
|\ \
| * | Add a unit testJon Bratseth2018-04-172-42/+107
| |/
* | Fix error messageJon Bratseth2018-04-171-1/+1
| |
* | Make error messages understandableJon Bratseth2018-04-162-2/+49
|/
* Merge pull request #5570 from vespa-engine/gjoranv/validate-secret-storegjoranv2018-04-133-0/+131
|\ | | | | Add validator for secret-store vs athenz in deployment.xml.
| * Add validator for secret-store vs athenz in deployment.xml.gjoranv2018-04-133-0/+131
| |
* | Merge pull request #5571 from vespa-engine/mortent/enable-athenz-write-protect-gjoranv2018-04-132-7/+2
|\ \ | |/ |/| Require access-control in all systems
| * Put back zone setting without 'cd', as we need 'prod' environment.gjoranv2018-04-131-0/+4
| |
| * Revert "Temporarily validate apps only in CD zones."Morten Tokle2018-04-132-10/+1
| | | | | | | | This reverts commit 0d95d5e3cfce0c4a30f377e100bf22fdecd7733b.
* | Merge pull request #5565 from vespa-engine/arnej/remember-deploystate-lessJon Bratseth2018-04-128-52/+32
|\ \ | | | | | | refactor, saving just the state we need to