aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Only count time with no threads availableHåkon Hallingstad2018-06-141-9/+9
* | | | Merge pull request #6202 from vespa-engine/balder/remove-version-and-avoid-go...Henning Baldersheim2018-06-1430-273/+141
|\ \ \ \
| * | | | Update commentsHenning Baldersheim2018-06-145-17/+7
| * | | | Update after comments from @vekterliHenning Baldersheim2018-06-1415-65/+26
| * | | | ByteBuffer -> nbostreamHenning Baldersheim2018-06-149-36/+30
| * | | | Remove unused versionHenning Baldersheim2018-06-1411-32/+19
| * | | | Remove unused version from apiHenning Baldersheim2018-06-1418-50/+34
| * | | | ByteBuffer -> nbostreamHenning Baldersheim2018-06-1418-120/+72
* | | | | Merge pull request #6213 from vespa-engine/geirst/validate-complex-attribute-...Henning Baldersheim2018-06-147-70/+356
|\ \ \ \ \
| * | | | | Validate that complex fields that have struct field attributes are supported.Geir Storli2018-06-144-0/+160
| * | | | | Use document type to resolve struct data types when checking whether a comple...Geir Storli2018-06-144-70/+196
* | | | | | Merge pull request #6212 from vespa-engine/bjorncs/fix-keystore-passwordBjørn Christian Seime2018-06-141-2/+3
|\ \ \ \ \ \
| * | | | | | Set password when creating key entryBjørn Christian Seime2018-06-141-2/+3
* | | | | | | Merge pull request #6211 from vespa-engine/bjorncs/enable-write-access-var-vespaBjørn Christian Seime2018-06-141-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Allow container to write to var/vespaBjørn Christian Seime2018-06-141-0/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #6210 from vespa-engine/bjorncs/node-identifier-filter-fixBjørn Christian Seime2018-06-142-0/+23
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Allow bare metal tenant nodes with Calypso certificateBjørn Christian Seime2018-06-142-0/+23
|/ / / / /
* | | | | Merge pull request #6207 from vespa-engine/hakonhall/avoid-set-node-state-retryHåkon Hallingstad2018-06-144-15/+43
|\ \ \ \ \
| * | | | | Avoid set-node-state retryHåkon Hallingstad2018-06-144-15/+43
* | | | | | Merge pull request #6208 from vespa-engine/bjorncs/fixMorten Tokle2018-06-141-1/+1
|\ \ \ \ \ \
| * | | | | | Specify scheme and port for configserver endpointBjørn Christian Seime2018-06-141-1/+1
|/ / / / / /
* | | | | | Merge pull request #6133 from vespa-engine/bjorncs/improve-error-messagesBjørn Christian Seime2018-06-142-21/+69
|\ \ \ \ \ \
| * | | | | | Remove unnecessary latchBjørn Christian Seime2018-06-141-30/+2
| * | | | | | Try to extract error message from non-2xx responsesBjørn Christian Seime2018-06-082-3/+79
* | | | | | | Merge pull request #6198 from vespa-engine/hakonhall/do-not-wait-for-version-...Håkon Hallingstad2018-06-145-6/+82
|\ \ \ \ \ \ \
| * | | | | | | Do not wait for version ack for failed set-node-stateHåkon Hallingstad2018-06-135-6/+82
* | | | | | | | Merge pull request #6203 from vespa-engine/mpolden/remove-unused-codeMartin Polden2018-06-145-78/+0
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Remove unused BrooklynStatusResourceMartin Polden2018-06-141-23/+0
| * | | | | | | Remove unused common packageMartin Polden2018-06-143-41/+0
| * | | | | | | Remove unused HeaderFieldsMartin Polden2018-06-141-14/+0
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #6205 from vespa-engine/balder/return-correct-errorcodeHenning Baldersheim2018-06-142-26/+39
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Catch explicit known exceptions and return correct error code.Henning Baldersheim2018-06-142-26/+39
|/ / / / / /
* | | | | | Merge pull request #6204 from vespa-engine/ovirtanen/convert-leftover-test-in...Bjørn Christian Seime2018-06-142-75/+78
|\ \ \ \ \ \
| * | | | | | Leftover scala test converted to javaOlli Virtanen2018-06-142-75/+78
* | | | | | | Merge pull request #6196 from vespa-engine/bjorncs/certificate-to-diskMorten Tokle2018-06-1410-203/+261
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Store configserver certificate to VESPA_HOME/var/vespa/siaBjørn Christian Seime2018-06-131-58/+39
| * | | | | | Cache tenant certificate and private key to diskBjørn Christian Seime2018-06-132-25/+71
| * | | | | | Add utility methods for reading/writing SIA credentialsBjørn Christian Seime2018-06-131-0/+73
| * | | | | | Remove support for ntokensBjørn Christian Seime2018-06-133-16/+9
| * | | | | | Remove deprecated ZtsClientBjørn Christian Seime2018-06-135-106/+71
| * | | | | | Use pascal case for constantsBjørn Christian Seime2018-06-131-3/+3
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #6192 from vespa-engine/ovirtanen/convert-scala-to-java-in...Olli Virtanen2018-06-1473-1962/+3057
|\ \ \ \ \ \
| * | | | | | Bundle-plugin Scala code converted to JavaOlli Virtanen2018-06-1373-1962/+3057
| |/ / / / /
* | | | | | Merge pull request #6197 from vespa-engine/gjoranv/felix-5.6.10Bjørn Christian Seime2018-06-141-1/+1
|\ \ \ \ \ \
| * | | | | | Upgrade felix to 5.6.10gjoranv2018-06-131-1/+1
* | | | | | | Merge pull request #6199 from vespa-engine/gjoranv/shade-pluginBjørn Christian Seime2018-06-141-6/+15
|\ \ \ \ \ \ \
| * | | | | | | Use shade plugin instead of assembly.gjoranv2018-06-141-6/+15
| |/ / / / / /
* | | | | | | Merge pull request #6194 from vespa-engine/arnej/cleanup-getversionArnstein Ressem2018-06-143-31/+5
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | cleanup leftoversArne Juul2018-06-132-2/+0
| * | | | | | simplify moreArne Juul2018-06-131-23/+4