aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5729 from vespa-engine/geirst/disallow-importing-fields-o...Geir Storli2018-04-2710-158/+21
|\
| * Disallow importing fields of type predicate as this is not (yet) supported by...Geir Storli2018-04-2610-158/+21
* | Merge pull request #5730 from vespa-engine/bjorncs/athenz-identity-providerBjørn Christian Seime2018-04-2713-90/+99
|\ \
| * | Only create SSLContext once for each updateBjørn Christian Seime2018-04-264-20/+50
| * | Rename getDomain() -> domain() + getService() -> service()Bjørn Christian Seime2018-04-262-4/+4
| * | Use separate types for tenant and vespa identity providersBjørn Christian Seime2018-04-269-66/+45
* | | Merge pull request #5733 from vespa-engine/hmusum/remove-disableFiledistribut...Valerij Fredriksen2018-04-272-41/+8
|\ \ \
| * | | Remove disableFiledistributor, temp setting not used anymoreHarald Musum2018-04-272-41/+8
* | | | Merge pull request #5732 from vespa-engine/freva/export-stateHåkon Hallingstad2018-04-271-0/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Export state APIValerij Fredriksen2018-04-261-0/+5
* | | | Merge pull request #5724 from vespa-engine/bratseth/correct-listPropertiesJon Bratseth2018-04-2720-228/+266
|\ \ \ \ | |/ / / |/| | |
| * | | Wire missing query API properties into typesJon Bratseth2018-04-265-7/+22
| * | | Cleanup some unmaintainable messJon Bratseth2018-04-264-42/+52
| * | | Include Query model in listPropertiesJon Bratseth2018-04-2615-201/+214
* | | | Merge pull request #5731 from vespa-engine/hakonhall/log-for-each-configureaclsHarald Musum2018-04-261-0/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Log for each configureAclsHåkon Hallingstad2018-04-261-0/+1
|/ / /
* | | Merge pull request #5727 from vespa-engine/freva/getOptionalNodeValerij Fredriksen2018-04-2611-36/+58
|\ \ \
| * | | Throw NodeRepositoryException insteadValerij Fredriksen2018-04-261-5/+4
| * | | Use getNodeValerij Fredriksen2018-04-261-2/+1
| * | | Add getNode and getOptionalNodeValerij Fredriksen2018-04-2611-30/+54
* | | | Merge pull request #5717 from vespa-engine/vekterli/handle-explicit-node-stat...Geir Storli2018-04-263-19/+105
|\ \ \ \
| * | | | Make test names less ambiguousTor Brede Vekterli2018-04-261-6/+6
| * | | | Don't be silly and deref an iterator after it has been erasedTor Brede Vekterli2018-04-261-1/+1
| * | | | Handle explicit node state response case without pending requestTor Brede Vekterli2018-04-263-19/+105
* | | | | Merge pull request #5725 from vespa-engine/toregge/change-naming-from-referen...Geir Storli2018-04-2614-173/+177
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Adjust naming: referencing lid -> source lid.Tor Egge2018-04-263-3/+7
| * | | | Adjust naming: referenced lid -> target lid.Tor Egge2018-04-2614-171/+171
| | |/ / | |/| |
* | | | Merge pull request #5721 from vespa-engine/mpolden/cleanupJon Marius Venstad2018-04-2622-196/+183
|\ \ \ \
| * | | | Refactor system upgrade test helpersMartin Polden2018-04-2613-125/+105
| * | | | Fix exception messageMartin Polden2018-04-261-1/+7
| * | | | Rename deployApplication -> deployMartin Polden2018-04-265-16/+16
| * | | | Inject NodeRepositoryClientInterface only where neededMartin Polden2018-04-266-54/+55
* | | | | make it possible to disable host name verification (#5722)Andreas Eriksen2018-04-261-0/+8
| |_|_|/ |/| | |
* | | | Merge pull request #5719 from vespa-engine/havardpe/preserve-min-max-for-matc...Arne H Juul2018-04-266-33/+166
|\ \ \ \
| * | | | preserve min/max values for time-related matching statsHåvard Pettersen2018-04-266-33/+166
* | | | | Merge pull request #5720 from vespa-engine/gjoranv/java9-prep-03gjoranv2018-04-268-13/+20
|\ \ \ \ \
| * | | | | Fix wrong javadoc tag.gjoranv2018-04-262-2/+2
| * | | | | Remove usage of apis deprecated in Java 9.gjoranv2018-04-266-11/+18
* | | | | | Merge pull request #5723 from vespa-engine/gjoranv/remove-java7-utilJon Bratseth2018-04-266-83/+4
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Remove vespajlib:Utilgjoranv2018-04-266-83/+4
* | | | | | Merge pull request #5716 from vespa-engine/jvenstad/DO-unifiedMartin Polden2018-04-265-61/+151
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Ignore more no-op deploymentsJon Marius Venstad2018-04-261-8/+9
| * | | | | Always clear outstanding change when triggering new application changeJon Marius Venstad2018-04-261-1/+2
| * | | | | Suppress blocked parts of Change, with testJon Marius Venstad2018-04-262-34/+90
| * | | | | Better condition for completedAtJon Marius Venstad2018-04-261-10/+8
| * | | | | Consider completion of separate parts of ChangeJon Marius Venstad2018-04-263-14/+48
* | | | | | Merge pull request #5718 from vespa-engine/mortent/add-ipaddress-csrBjørn Christian Seime2018-04-266-19/+80
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Include ipaddress SAN in CSRMorten Tokle2018-04-266-19/+80
* | | | | | Merge pull request #5708 from vespa-engine/bratseth/select-2-hosts-by-indexJon Bratseth2018-04-262-28/+29
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Select 2 cluster controllers by indexJon Bratseth2018-04-252-28/+29