summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove Netty by replacing cookie codec with Jetty + Java SEBjørn Christian Seime2017-09-016-60/+108
* Merge pull request #3301 from vespa-engine/aressem/avoid-recursive-linkLester Solbakken2017-09-011-7/+7
|\
| * Avoid recursive link in components when re-running make install.Arnstein Ressem2017-09-011-7/+7
* | Merge pull request #3298 from vespa-engine/gjoranv/reintroduce-removed-methodgjoranv2017-08-311-2/+17
|\ \
| * | Put back removed ConfigGenerator.createClassName.gjoranv2017-08-311-2/+17
|/ /
* | Merge pull request #2934 from vespa-engine/hmusum/use-409-response-code-for-f...Jon Bratseth2017-08-315-15/+44
|\ \
| * | Rename exceptionHarald Musum2017-08-313-7/+7
| * | Return 409 if there is a conflict when activatingHarald Musum2017-07-105-15/+44
* | | Merge pull request #3286 from vespa-engine/gjoranv/exclude-scala-xmlBjørn Christian Seime2017-08-3112-33/+84
|\ \ \
| * \ \ Merge branch 'master' into gjoranv/exclude-scala-xmlgjoranv2017-08-31410-2142/+4325
| |\ \ \
| * | | | Exclude scala-xml from provided classpathgjoranv2017-08-315-0/+26
| * | | | Rewrite ConfigGenerator.createClassName to Java.gjoranv2017-08-317-33/+58
* | | | | Merge pull request #3291 from vespa-engine/bjorncs/travisgjoranv2017-08-312-1/+12
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Show log output during buildBjørn Christian Seime2017-08-312-1/+12
* | | | | Merge pull request #3283 from vespa-engine/mpolden/trigger-deployments-in-par...Martin Polden2017-08-3112-226/+422
|\ \ \ \ \
| * | | | | Ensure all parallel deployments complete before next stepMartin Polden2017-08-314-16/+42
| * | | | | Handle jobs that complete out of orderMartin Polden2017-08-313-2/+40
| * | | | | Fix testMartin Polden2017-08-312-16/+23
| * | | | | Move zones() up to simplifyJon Marius Venstad2017-08-312-27/+20
| * | | | | Trigger parallel deploymentsMartin Polden2017-08-3111-169/+260
| * | | | | Restore indentationMartin Polden2017-08-311-2/+2
| * | | | | Extract DeploymentOrder classMartin Polden2017-08-312-70/+111
* | | | | | Merge pull request #3294 from vespa-engine/jvenstad/remove-unused-code-and-ge...Martin Polden2017-08-312-9/+4
|\ \ \ \ \ \
| * | | | | | Remove unused code and set the right field with WARNINGJon Marius Venstad2017-08-312-9/+4
* | | | | | | Merge pull request #3292 from vespa-engine/bjorncs/readmeGeir Storli2017-08-311-1/+2
|\ \ \ \ \ \ \
| * | | | | | | Improve doc on building JavaBjørn Christian Seime2017-08-311-1/+2
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #3293 from vespa-engine/bjorncs/bootstrapBjørn Christian Seime2017-08-312-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Upgrade plugin to reduce log spamBjørn Christian Seime2017-08-311-1/+1
| * | | | | | Reduce verbose output from bootstrap script.Bjørn Christian Seime2017-08-311-1/+1
|/ / / / / /
* | | | | | Merge pull request #3290 from vespa-engine/bjorncs/travisBjørn Christian Seime2017-08-311-0/+1
|\ \ \ \ \ \
| * | | | | | Don't cache repository.xmlBjørn Christian Seime2017-08-311-0/+1
|/ / / / / /
* | | | | | Merge pull request #3285 from vespa-engine/arnej/render-inf-relevance-as-0Arne H Juul2017-08-313-3/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | render infinite or NaN relevance as "0.0"Arne Juul2017-08-313-3/+7
|/ / / / /
* | | | | Merge pull request #3251 from vespa-engine/bjorncs/reduce-mem-usage-configserverBjørn Christian Seime2017-08-311-0/+4
|\ \ \ \ \
| * | | | | Reduce number of worker threads from default (500)Bjørn Christian Seime2017-08-291-0/+4
* | | | | | Merge pull request #3284 from vespa-engine/bjorncs/stabilize-testArnstein Ressem2017-08-311-1/+1
|\ \ \ \ \ \
| * | | | | | Stabilize testBjørn Christian Seime2017-08-311-1/+1
|/ / / / / /
* | | | | | Merge pull request #3269 from vespa-engine/toregge/refactor-gid-to-lid-change...Geir Storli2017-08-3121-147/+310
|\ \ \ \ \ \
| * | | | | | Remove unneeded checks.Tor Egge2017-08-301-6/+0
| * | | | | | Propagate API changes to GidToLidChangeListener and ReferenceAttribute:Tor Egge2017-08-3013-88/+150
| * | | | | | Change API for IGidToLidChangeHandler:Tor Egge2017-08-3010-21/+160
| * | | | | | Prepare for gid to lid change notifications coming from differentTor Egge2017-08-304-69/+37
* | | | | | | Merge pull request #3282 from vespa-engine/revert-3271-gjoranv/exclude-antlr-...Harald Musum2017-08-314-44/+4
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Revert "Make antlr and antlr4 invisible for customer projects."Arnstein Ressem2017-08-314-44/+4
|/ / / / / /
* | | | | | Merge pull request #3281 from vespa-engine/balder/give-vespamallocxx-their-ol...Henning Baldersheim2017-08-3012-20/+20
|\ \ \ \ \ \
| * | | | | | Update tests with correct library name.Henning Baldersheim2017-08-309-12/+12
| * | | | | | Update unit test with "libvespamallocd"Jon Marius Venstad2017-08-301-3/+3
| * | | | | | Since we are having so many issues with libyell we need to use an allocator t...Henning Baldersheim2017-08-301-1/+1
| * | | | | | Give the libvespamallocXXX back their old names.Henning Baldersheim2017-08-301-4/+4
* | | | | | | Merge pull request #3261 from vespa-engine/balder/prereserve-for-expected-num...Henning Baldersheim2017-08-303-1/+16
|\ \ \ \ \ \ \