summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3234 from ↵Jon Bratseth2017-08-3065-531/+748
|\ | | | | | | | | vespa-engine/bratseth/store-provisioninfo-without-version Bratseth/store provisioninfo without version
| * Remove warningJon Bratseth2017-08-291-1/+1
| |
| * Merge with masterJon Bratseth2017-08-28603-1323/+24055
| |\
| * | ProvisionInfo -> AllocatedHostsJon Bratseth2017-08-288-113/+115
| | |
| * | Add one wimphy testJon Bratseth2017-08-2810-33/+60
| | |
| * | Allow model evolution which removes clustersJon Bratseth2017-08-287-28/+79
| | |
| * | Explicitly pass the correct allocated hostsJon Bratseth2017-08-286-40/+62
| | |
| * | Track API changes, remove warningsJon Bratseth2017-08-285-18/+13
| | |
| * | ProvisionInfo -> AllocatedHostsJon Bratseth2017-08-2828-208/+246
| | |
| * | Allocation consistency between model versionsJon Bratseth2017-08-2820-76/+121
| | |
| * | Allocation consistency between model versionsJon Bratseth2017-08-2829-172/+211
| | |
| * | Nonfunctional changes onlyJon Bratseth2017-08-238-7/+3
| | |
* | | Merge pull request #3259 from vespa-engine/hmusum/avoid-validating-xml-twiceJon Bratseth2017-08-291-1/+0
|\ \ \ | | | | | | | | Avoid validating XML twice
| * | | Avoid validating XML twiceHarald Musum2017-08-291-1/+0
|/ / /
* | | Merge pull request #3258 from vespa-engine/revert-3248-bjorncs/remove-nettyHenning Baldersheim2017-08-296-133/+64
|\ \ \ | | | | | | | | Revert "Remove Netty by replacing cookie codec with Jetty + Java SE"
| * | | Revert "Remove Netty by replacing cookie codec with Jetty + Java SE"Henning Baldersheim2017-08-296-133/+64
|/ / /
* | | Merge pull request #3257 from vespa-engine/mpolden/revert-serialization-changeMartin Polden2017-08-292-39/+1
|\ \ \ | | | | | | | | Revert "Fix serialization of legacy deploying value"
| * | | Revert "Fix serialization of legacy deploying value"Martin Polden2017-08-292-39/+1
|/ / / | | | | | | | | | This reverts commit 44cd92e6ff96b2e40c990fc18cad8c56a85fe73d.
* | | Merge pull request #3248 from vespa-engine/bjorncs/remove-nettyHenning Baldersheim2017-08-296-64/+133
|\ \ \ | | | | | | | | Remove Netty by replacing cookie codec with Jetty + Java SE
| * | | Remove Netty by replacing cookie codec with Jetty + Java SEBjørn Christian Seime2017-08-296-64/+133
| | |/ | |/|
* | | Merge pull request #3254 from vespa-engine/hmusum/merge-two-identical-methodsHarald Musum2017-08-295-16/+11
|\ \ \ | | | | | | | | Merge two identical methods
| * | | Merge two identical methodsHarald Musum2017-08-295-16/+11
| | | |
* | | | Merge pull request #3252 from vespa-engine/mpolden/application-serialization-fixJon Marius Venstad2017-08-293-15/+14
|\ \ \ \ | | | | | | | | | | Application serialization fix
| * | | | Fix serialization of legacy deploying valueMartin Polden2017-08-292-1/+39
| | | | |
| * | | | Make delayed deployer ignore applications with no delay stepsMartin Polden2017-08-291-1/+4
| | | | |
| * | | | Fix TODOMartin Polden2017-08-292-43/+1
| | | | |
* | | | | Merge pull request #3246 from vespa-engine/bjorncs/ignore-vagrant-artifactsGeir Storli2017-08-291-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Add .vagrant directory to gitignore
| * | | | | Add .vagrant directory to gitignoreBjørn Christian Seime2017-08-291-0/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #3244 from vespa-engine/bjorncs/readme-1Geir Storli2017-08-291-3/+2
|\ \ \ \ \ | | | | | | | | | | | | Improve documentation on building the Java
| * | | | | Improve documentation on building the JavaBjørn Christian Seime2017-08-291-3/+2
| | | | | |
* | | | | | Merge pull request #3243 from vespa-engine/bjorncs/readmeGeir Storli2017-08-291-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Link to section
| * | | | | | Link to sectionBjørn Christian Seime2017-08-291-1/+1
| |/ / / / /
* | | | | | Merge pull request #3250 from ↵Tor Brede Vekterli2017-08-292-4/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/vekterli/use-low-priority-for-generated-gc-operation Use priority class LOW for generated GC operations
| * | | | | | Use priority class LOW for generated GC operationsTor Brede Vekterli2017-08-292-4/+14
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoids starvation of merge (and split) operations when GC ops are preempted on heavily loaded content nodes. This fixes #3249
* | | | | | Merge pull request #3241 from vespa-engine/freva/write-provision-historyValerij Fredriksen2017-08-2920-99/+242
|\ \ \ \ \ \ | | | | | | | | | | | | | | Write initial node state to history
| * | | | | | Write initial node state to historyvalerijf2017-08-2920-99/+242
| | | | | | |
* | | | | | | Merge pull request #3240 from ↵Arne H Juul2017-08-291-7/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/bratseth/handle-normalizing-to-nothing Handle that normalizing leads to an empty query
| * | | | | | | Handle that normalizing leads to an empty queryJon Bratseth2017-08-291-7/+8
| | | | | | | |
* | | | | | | | Merge pull request #3247 from vespa-engine/freva/rethrow-container-createValerij Fredriksen2017-08-291-3/+2
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | Rethrow exception from docker-java if container create fails as Docke…
| * | | | | | | Rethrow exception from docker-java if container create fails as DockerExceptionvalerijf2017-08-291-3/+2
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #3245 from ↵Martin Polden2017-08-292-26/+31
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | vespa-engine/jvenstad/make-unexpected-deployment-a-noop Let unexpected deployment return a dummy ActivateResult
| * | | | | | Let unexpected deployment return a dummy ActivateResultJon Marius Venstad2017-08-292-26/+31
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #3233 from vespa-engine/hmusum/refactor-schema-validationgjoranv2017-08-2911-223/+270
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Refactor schema validation setup
| * | | | | Refactor schema validation setupHarald Musum2017-08-2811-223/+270
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Try to avoid hardcoding and having to specify version several times * Make sure to only copy schema files once
* | | | | | Merge pull request #3242 from vespa-engine/mpolden/log-first-failing-timeJon Marius Venstad2017-08-291-16/+14
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Log the time when job started failing
| * | | | | Log the time when job started failingMartin Polden2017-08-291-16/+14
| | |_|/ / | |/| | |
* | | | | Merge pull request #3239 from vespa-engine/balder/zero-on-cloneJon Bratseth2017-08-282-4/+8
|\ \ \ \ \ | | | | | | | | | | | | Balder/zero on clone
| * | | | | Make assignment of sessionid independent of wether getSessionId(true) has ↵Henning Baldersheim2017-08-282-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | been called prior to clone(). Now it will behave as if getSessionId() has NOT been called, which is what is considered current behavior by 99% of usage patterns.
* | | | | | Merge pull request #3237 from vespa-engine/balder/restore-old-behavior-on-cloneJon Bratseth2017-08-282-10/+19
|\| | | | | | | | | | | | | | | | | Restore old beahvior on clone.
| * | | | | Restore old beahvior on clone.Henning Baldersheim2017-08-282-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - If getSessionId(true) has been called prior to clone, allcones will share sessionid with parent. - If not, they will all get their own.