summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [6.153.29-1].vespa-6.153.29-1by-screwdriver2017-10-054-1/+2
| | | | | | Created by command: /usr/bin/tito tag --use-version=6.153.29 --no-auto-changelog
* Merge pull request #3650 from ↵Jon Bratseth2017-10-043-51/+75
|\ | | | | | | | | vespa-engine/mpolden/increase-offered-capacity-constrained-jobs Increase offered jobs in capacity constrained zones
| * Increase offered jobs in capacity constrained zonesMartin Polden2017-10-043-51/+75
| |
* | Merge pull request #3646 from ↵Tor Brede Vekterli2017-10-042-10/+42
|\ \ | | | | | | | | | | | | vespa-engine/geirst/update-vagrant-centos-clion-build-guide Geirst/update vagrant centos clion build guide
| * | Add section on development using CLion.Geir Storli2017-10-041-6/+36
| | |
| * | Update with new centos, clion and align some settings to match build env.Geir Storli2017-10-041-4/+6
| |/
* | Merge pull request #3648 from ↵Martin Polden2017-10-042-27/+15
|\ \ | | | | | | | | | | | | vespa-engine/revert-3647-mpolden/increase-offered-capacity-constrained-jobs Revert "Increase offered jobs in capacity constrained zones"
| * | Revert "Increase offered jobs in capacity constrained zones"Martin Polden2017-10-042-27/+15
|/ /
* | Merge pull request #3647 from ↵Jon Bratseth2017-10-042-15/+27
|\ \ | | | | | | | | | | | | vespa-engine/mpolden/increase-offered-capacity-constrained-jobs Increase offered jobs in capacity constrained zones
| * | Increase offered jobs in capacity constrained zonesMartin Polden2017-10-042-15/+27
| |/
* | Merge pull request #3645 from ↵Tor Brede Vekterli2017-10-042-0/+53
|\ \ | | | | | | | | | | | | vespa-engine/havardpe/convenience-toplevel-slime-array-object-access slime toplevel convenience access
| * | slime toplevel convenience accessHåvard Pettersen2017-10-042-0/+53
| | |
* | | Merge pull request #3633 from vespa-engine/toregge/remove-more-dead-codeGeir Storli2017-10-0425-3091/+0
|\ \ \ | | | | | | | | Remove unused support for SPI over RPC.
| * | | Remove unused support for SPI over RPC.Tor Egge2017-10-0325-3091/+0
| | | |
* | | | Merge pull request #3644 from vespa-engine/gjoranv/remove-scala-createClassNameBjørn Christian Seime2017-10-043-22/+0
|\ \ \ \ | | | | | | | | | | Gjoranv/remove scala create class name
| * | | | Remove scala-parser-combinators dependency.gjoranv2017-10-042-6/+0
| | | | |
| * | | | Remove ConfigGenerator.createClassName (scala)gjoranv2017-10-041-16/+0
|/ / / / | | | | | | | | | | | | - No longer used by any live config models.
* | | | Merge pull request #3642 from ↵Bjørn Christian Seime2017-10-042-1/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | vespa-engine/aressem/use-plain-centos-when-building-vespa Use plain CentOS base when building Vespa rpm.
| * | | | Use plain CentOS base when building Vespa rpm.Arnstein Ressem2017-10-042-1/+7
| | |_|/ | |/| |
* | | | Merge pull request #3643 from ↵hakonhall2017-10-041-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | vespa-engine/revert-3627-revert-3624-revert-3623-revert-3617-revert-3607-hakon/enable-new-servicemonitor Revert "4 x Revert "Enable new ServiceMonitor""
| * | | Revert "4 x Revert "Enable new ServiceMonitor""Harald Musum2017-10-041-1/+1
|/ / /
* | | Merge pull request #3641 from vespa-engine/mpolden/trigger-apiMartin Polden2017-10-043-21/+124
|\ \ \ | | | | | | | | Add trigger API
| * | | Add trigger APIMartin Polden2017-10-033-21/+124
| |/ /
* | | Merge pull request #3639 from vespa-engine/revert-3631-bjorncs/surefireHarald Musum2017-10-031-1/+1
|\ \ \ | | | | | | | | Revert "Upgrade surefire to 2.20.1"
| * | | Revert "Upgrade surefire to 2.20.1"Harald Musum2017-10-031-1/+1
|/ / /
* | | Merge pull request #3636 from ↵hakonhall2017-10-037-24/+80
|\ \ \ | | | | | | | | | | | | | | | | vespa-engine/hakon/handle-unsuccessful-http-status-codes-in-node-admin Handle unsuccessful HTTP status codes in node admin
| * | | Handle unsuccessful HTTP status codes in node adminHåkon Hallingstad2017-10-037-24/+80
| |/ /
* | | Merge pull request #3634 from vespa-engine/bjorncs/jdisc-principalBjørn Christian Seime2017-10-033-2/+14
|\ \ \ | | | | | | | | Expose Principal as attribute/property in request types
| * | | Support setting attributes for 'application' requestsBjørn Christian Seime2017-10-032-0/+11
| | | |
| * | | Expose Principal as attribute/property in request typesBjørn Christian Seime2017-10-031-2/+3
| |/ /
* | | Merge pull request #3635 from vespa-engine/bjorncs/disable-faulty-testhakonhall2017-10-031-0/+1
|\ \ \ | |/ / |/| | Temporarily ignore unstable orchestrator test
| * | Temporarily ignore unstable orchestrator testBjørn Christian Seime2017-10-031-0/+1
|/ /
* | Merge pull request #3631 from vespa-engine/bjorncs/surefireBjørn Christian Seime2017-10-031-1/+1
|\ \ | | | | | | Upgrade surefire to 2.20.1
| * | Upgrade surefire to 2.20.1Bjørn Christian Seime2017-10-031-1/+1
| | | | | | | | | | | | | | | Surefire 2.20.x improves debug output for build failures. Let's give it a try.
* | | Merge pull request #3632 from vespa-engine/balder/do-not-move-healt-port-yetHenning Baldersheim2017-10-031-1/+1
|\ \ \ | |/ / |/| | Do not move the health port yet.
| * | Do not move the health port yet.Henning Baldersheim2017-10-031-1/+1
|/ /
* | Merge pull request #3630 from vespa-engine/bratseth/separate-truststore-passwordBjørn Christian Seime2017-10-032-37/+36
|\ \ | | | | | | Bratseth/separate truststore password
| * | Allow swetting no trust store passwordJon Bratseth2017-10-032-3/+10
| | |
| * | Nonfunctional changes onlyJon Bratseth2017-10-032-10/+11
| | |
| * | Nonfunctional changes onlyJon Bratseth2017-10-031-30/+21
| |/
* | Merge pull request #3625 from ↵Martin Polden2017-10-031-2/+2
|\ \ | | | | | | | | | | | | vespa-engine/hmusum/reduce-log-level-for-running-acl-commands Reduce log level when running acl commands
| * | Reduce log level when running acl commandsHarald Musum2017-10-031-2/+2
| | |
* | | Merge pull request #3629 from vespa-engine/revert-3620-bjorncs/distBjørn Christian Seime2017-10-031-5/+0
|\ \ \ | | | | | | | | Revert "Remove release suffix from release tag"
| * | | Revert "Remove release suffix from release tag"Bjørn Christian Seime2017-10-031-5/+0
|/ / /
* | | Merge pull request #3627 from ↵hakonhall2017-10-031-1/+1
|\ \ \ | | | | | | | | | | | | | | | | vespa-engine/revert-3624-revert-3623-revert-3617-revert-3607-hakon/enable-new-servicemonitor 4 x Revert "Enable new ServiceMonitor"
| * | | Revert "Revert "Revert "Revert "Enable new ServiceMonitor""""hakonhall2017-10-031-1/+1
| | | |
* | | | Merge pull request #3626 from vespa-engine/hakon/avoid-non-slobrok-serviceshakonhall2017-10-032-1/+7
|\ \ \ \ | | | | | | | | | | Avoid non-Slobrok services
| * | | | Avoid non-Slobrok servicesHåkon Hallingstad2017-10-032-1/+7
| |/ / /
* | | | Merge pull request #3609 from vespa-engine/bjorncs/mavenArnstein Ressem2017-10-033-8/+15
|\ \ \ \ | |_|_|/ |/| | | Bjorncs/maven
| * | | Source devtoolset-6.sh to use new Maven binaryBjørn Christian Seime2017-10-022-0/+2
| | | |