summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* We only need one vtagHenning Baldersheim2016-10-2136-568/+303
* Merge pull request #928 from yahoo/freva/local-zone-config-serverHarald Musum2016-10-2110-36/+121
|\
| * Code to build vespa-local image and start config-server from IDEfreva2016-10-215-22/+87
| * Added support for building image in DockerImplfreva2016-10-215-14/+34
* | Merge pull request #927 from yahoo/musum/use-docker-tester-in-more-testsfreva2016-10-215-400/+277
|\ \ | |/ |/|
| * Merge branch 'master' into musum/use-docker-tester-in-more-testsHarald Musum2016-10-2111-21/+61
| |\ | |/ |/|
* | Merge pull request #926 from yahoo/freva/yamas-routing-and-dimensions-fixHarald Musum2016-10-2115-21/+65
|\ \
| * | Moved parentHostHostname to Environmentfreva2016-10-2110-7/+21
| * | Add routing to metrics output, add zone and parentHostname to dimensionsfreva2016-10-215-12/+47
| * | No longer set namespace by default in SecretAgentSchedulerfreva2016-10-212-8/+3
|/ /
| * Use DockerTester in more testsHarald Musum2016-10-215-396/+277
|/
* Move messages from log to trace (#925)Jon Bratseth2016-10-211-21/+20
* Merge pull request #908 from yahoo/bratseth/document-api-in-container-devJon Bratseth2016-10-217-11/+48
|\
| * Correct script nameJon Bratseth2016-10-211-1/+1
| * Add container module for exteral dependeesJon Bratseth2016-10-197-8/+44
| * Nonfunctional changes onlyJon Bratseth2016-10-191-2/+3
| * Nonfunctional changes onlyJon Bratseth2016-10-191-2/+2
* | Bump jetty version to 9.3.13 (#920)Bjørn Christian Seime2016-10-211-1/+1
* | Merge pull request #924 from yahoo/bratseth/clearer-outofcapacity-messagesKristian Aune2016-10-211-10/+10
|\ \
| * | Clearer OutOfCapacity messagesJon Bratseth2016-10-211-10/+10
* | | Merge pull request #923 from yahoo/geirst/tensor-function-compiler-for-dense-...Tor Egge2016-10-2113-0/+264
|\ \ \ | |/ / |/| |
| * | Add tensor function compiler for dot product between two 1d dense tensors.Geir Storli2016-10-2113-0/+264
* | | Merge pull request #919 from yahoo/musum/add-docker-testerfreva2016-10-212-93/+129
|\ \ \
| * | | Do not mock Environment, mock InetAddressResolverHarald Musum2016-10-201-3/+8
| * | | Add DockerTester to make tests simplerHarald Musum2016-10-202-93/+124
* | | | Merge pull request #922 from yahoo/hmusum/avoid-repeatead-image-downloadingfreva2016-10-211-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Avoid scheduling download of the same image many timesHarald Musum2016-10-211-1/+1
|/ / /
* | | Merge pull request #917 from yahoo/musum/inject-maintainerfreva2016-10-2012-31/+53
|\ \ \
| * | | Inject Maintainer instead of creating it in many placesHarald Musum2016-10-2012-31/+53
|/ / /
* | | Merge pull request #913 from yahoo/hmusum/set-content-typeHaakon Dybdahl2016-10-201-2/+11
|\ \ \
| * | | Only set content-type when we have a bodyHarald Musum2016-10-201-7/+3
| * | | Set content-type to application/json for all requestsHarald Musum2016-10-191-3/+16
* | | | Honor aliases element only in prod (#915)Harald Musum2016-10-203-9/+36
| |/ / |/| |
* | | Merge pull request #916 from yahoo/jvenstad/dump-cores-when-expected-toHenning Baldersheim2016-10-191-4/+4
|\ \ \
| * | | ulimit -c 0 only when neededJon Marius Venstad2016-10-191-4/+4
* | | | Merge pull request #910 from yahoo/toregge/add-generic-tensor-attributeGeir Storli2016-10-1917-142/+447
|\ \ \ \
| * | | | Adjust class comment and rename members according to review feedbackTor Egge2016-10-194-25/+22
| * | | | Add DenseTensorStore.Tor Egge2016-10-1913-55/+283
| * | | | Add GenericTensorAttribute and trim down TensorAttribute.Tor Egge2016-10-199-87/+167
* | | | | Merge pull request #914 from yahoo/jvenstad/avoid-unit-test-core-dumpsJon Marius Venstad2016-10-191-7/+7
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | |
| * | | Add 'ulimit -c 0 && ' in front of crashing exec-sJon Marius Venstad2016-10-191-7/+7
|/ / /
* | | Merge pull request #912 from yahoo/bratseth/yinst-switch-for-zk-request-restrictHarald Musum2016-10-191-3/+7
|\ \ \
| * | | Make it possible to turn zk acces control on from the envJon Bratseth2016-10-191-3/+7
* | | | Merge pull request #911 from yahoo/freva/container-exists-checkHarald Musum2016-10-191-4/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Check that container exists before attempting to restart servicesvalerijf2016-10-191-4/+6
|/ / /
* | | Merge pull request #909 from yahoo/freva/docker-config-paramsHarald Musum2016-10-196-18/+70
|\ \ \ | |/ / |/| |
| * | Added OOM-on-one-container-should-not-affect-the-others testvalerijf2016-10-193-2/+51
| * | Added more parameters to DockerConfig to easily set testing optionsvalerijf2016-10-193-16/+19
|/ /
* | Merge pull request #907 from yahoo/freva/fix-docker-testHarald Musum2016-10-192-10/+18
|\ \
| * | Fix failing docker testvalerijf2016-10-192-10/+18