summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* -DWITH_SHIPPED_GEOIP is handled explicit in filedistribution. No need for pol...Henning Baldersheim2016-10-211-1/+1
* Merge pull request #921 from yahoo/toregge/add-dense-tensor-attributeGeir Storli2016-10-2113-124/+997
|\
| * Rename anonymous function to more descriptive name.Tor Egge2016-10-211-4/+4
| * Rename class to more descriptive name.Tor Egge2016-10-211-12/+12
| * Extend tensor attribute test to test handling of tensor attributeTor Egge2016-10-211-18/+120
| * If tensor type for dense tensor store is abstract then different tensorsTor Egge2016-10-214-4/+62
| * Extend tensor mapper to handle unbound indexed dimensions in type spec.Tor Egge2016-10-212-21/+162
| * Rename member variables and methods for more clarity.Tor Egge2016-10-215-106/+102
| * Add dense tensor attribute.Tor Egge2016-10-209-102/+678
* | Merge pull request #932 from yahoo/balder/one-vtagArnstein Ressem2016-10-2140-588/+322
|\ \
| * | typoHenning Baldersheim2016-10-211-1/+1
| * | No need to set it to itself.Henning Baldersheim2016-10-211-2/+0
| * | Expose the V_TAG defines to vtag.cppHenning Baldersheim2016-10-211-1/+1
| * | We only need one vtagHenning Baldersheim2016-10-216-19/+20
| * | 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
|\ \ \ \