Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3234 from ↵ | Jon Bratseth | 2017-08-30 | 65 | -531/+748 |
|\ | | | | | | | | | vespa-engine/bratseth/store-provisioninfo-without-version Bratseth/store provisioninfo without version | ||||
| * | Remove warning | Jon Bratseth | 2017-08-29 | 1 | -1/+1 |
| | | |||||
| * | Merge with master | Jon Bratseth | 2017-08-28 | 603 | -1323/+24055 |
| |\ | |||||
| * | | ProvisionInfo -> AllocatedHosts | Jon Bratseth | 2017-08-28 | 8 | -113/+115 |
| | | | |||||
| * | | Add one wimphy test | Jon Bratseth | 2017-08-28 | 10 | -33/+60 |
| | | | |||||
| * | | Allow model evolution which removes clusters | Jon Bratseth | 2017-08-28 | 7 | -28/+79 |
| | | | |||||
| * | | Explicitly pass the correct allocated hosts | Jon Bratseth | 2017-08-28 | 6 | -40/+62 |
| | | | |||||
| * | | Track API changes, remove warnings | Jon Bratseth | 2017-08-28 | 5 | -18/+13 |
| | | | |||||
| * | | ProvisionInfo -> AllocatedHosts | Jon Bratseth | 2017-08-28 | 28 | -208/+246 |
| | | | |||||
| * | | Allocation consistency between model versions | Jon Bratseth | 2017-08-28 | 20 | -76/+121 |
| | | | |||||
| * | | Allocation consistency between model versions | Jon Bratseth | 2017-08-28 | 29 | -172/+211 |
| | | | |||||
| * | | Nonfunctional changes only | Jon Bratseth | 2017-08-23 | 8 | -7/+3 |
| | | | |||||
* | | | Merge pull request #3259 from vespa-engine/hmusum/avoid-validating-xml-twice | Jon Bratseth | 2017-08-29 | 1 | -1/+0 |
|\ \ \ | | | | | | | | | Avoid validating XML twice | ||||
| * | | | Avoid validating XML twice | Harald Musum | 2017-08-29 | 1 | -1/+0 |
|/ / / | |||||
* | | | Merge pull request #3258 from vespa-engine/revert-3248-bjorncs/remove-netty | Henning Baldersheim | 2017-08-29 | 6 | -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 Baldersheim | 2017-08-29 | 6 | -133/+64 |
|/ / / | |||||
* | | | Merge pull request #3257 from vespa-engine/mpolden/revert-serialization-change | Martin Polden | 2017-08-29 | 2 | -39/+1 |
|\ \ \ | | | | | | | | | Revert "Fix serialization of legacy deploying value" | ||||
| * | | | Revert "Fix serialization of legacy deploying value" | Martin Polden | 2017-08-29 | 2 | -39/+1 |
|/ / / | | | | | | | | | | This reverts commit 44cd92e6ff96b2e40c990fc18cad8c56a85fe73d. | ||||
* | | | Merge pull request #3248 from vespa-engine/bjorncs/remove-netty | Henning Baldersheim | 2017-08-29 | 6 | -64/+133 |
|\ \ \ | | | | | | | | | Remove Netty by replacing cookie codec with Jetty + Java SE | ||||
| * | | | Remove Netty by replacing cookie codec with Jetty + Java SE | Bjørn Christian Seime | 2017-08-29 | 6 | -64/+133 |
| | |/ | |/| | |||||
* | | | Merge pull request #3254 from vespa-engine/hmusum/merge-two-identical-methods | Harald Musum | 2017-08-29 | 5 | -16/+11 |
|\ \ \ | | | | | | | | | Merge two identical methods | ||||
| * | | | Merge two identical methods | Harald Musum | 2017-08-29 | 5 | -16/+11 |
| | | | | |||||
* | | | | Merge pull request #3252 from vespa-engine/mpolden/application-serialization-fix | Jon Marius Venstad | 2017-08-29 | 3 | -15/+14 |
|\ \ \ \ | | | | | | | | | | | Application serialization fix | ||||
| * | | | | Fix serialization of legacy deploying value | Martin Polden | 2017-08-29 | 2 | -1/+39 |
| | | | | | |||||
| * | | | | Make delayed deployer ignore applications with no delay steps | Martin Polden | 2017-08-29 | 1 | -1/+4 |
| | | | | | |||||
| * | | | | Fix TODO | Martin Polden | 2017-08-29 | 2 | -43/+1 |
| | | | | | |||||
* | | | | | Merge pull request #3246 from vespa-engine/bjorncs/ignore-vagrant-artifacts | Geir Storli | 2017-08-29 | 1 | -0/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Add .vagrant directory to gitignore | ||||
| * | | | | | Add .vagrant directory to gitignore | Bjørn Christian Seime | 2017-08-29 | 1 | -0/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #3244 from vespa-engine/bjorncs/readme-1 | Geir Storli | 2017-08-29 | 1 | -3/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Improve documentation on building the Java | ||||
| * | | | | | Improve documentation on building the Java | Bjørn Christian Seime | 2017-08-29 | 1 | -3/+2 |
| | | | | | | |||||
* | | | | | | Merge pull request #3243 from vespa-engine/bjorncs/readme | Geir Storli | 2017-08-29 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Link to section | ||||
| * | | | | | | Link to section | Bjørn Christian Seime | 2017-08-29 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #3250 from ↵ | Tor Brede Vekterli | 2017-08-29 | 2 | -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 operations | Tor Brede Vekterli | 2017-08-29 | 2 | -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-history | Valerij Fredriksen | 2017-08-29 | 20 | -99/+242 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Write initial node state to history | ||||
| * | | | | | | Write initial node state to history | valerijf | 2017-08-29 | 20 | -99/+242 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #3240 from ↵ | Arne H Juul | 2017-08-29 | 1 | -7/+8 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/bratseth/handle-normalizing-to-nothing Handle that normalizing leads to an empty query | ||||
| * | | | | | | | Handle that normalizing leads to an empty query | Jon Bratseth | 2017-08-29 | 1 | -7/+8 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #3247 from vespa-engine/freva/rethrow-container-create | Valerij Fredriksen | 2017-08-29 | 1 | -3/+2 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | Rethrow exception from docker-java if container create fails as Docke… | ||||
| * | | | | | | | Rethrow exception from docker-java if container create fails as DockerException | valerijf | 2017-08-29 | 1 | -3/+2 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #3245 from ↵ | Martin Polden | 2017-08-29 | 2 | -26/+31 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | vespa-engine/jvenstad/make-unexpected-deployment-a-noop Let unexpected deployment return a dummy ActivateResult | ||||
| * | | | | | | Let unexpected deployment return a dummy ActivateResult | Jon Marius Venstad | 2017-08-29 | 2 | -26/+31 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #3233 from vespa-engine/hmusum/refactor-schema-validation | gjoranv | 2017-08-29 | 11 | -223/+270 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Refactor schema validation setup | ||||
| * | | | | | Refactor schema validation setup | Harald Musum | 2017-08-28 | 11 | -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-time | Jon Marius Venstad | 2017-08-29 | 1 | -16/+14 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Log the time when job started failing | ||||
| * | | | | | Log the time when job started failing | Martin Polden | 2017-08-29 | 1 | -16/+14 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #3239 from vespa-engine/balder/zero-on-clone | Jon Bratseth | 2017-08-28 | 2 | -4/+8 |
|\ \ \ \ \ | | | | | | | | | | | | | Balder/zero on clone | ||||
| * | | | | | Make assignment of sessionid independent of wether getSessionId(true) has ↵ | Henning Baldersheim | 2017-08-28 | 2 | -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-clone | Jon Bratseth | 2017-08-28 | 2 | -10/+19 |
|\| | | | | | | | | | | | | | | | | | Restore old beahvior on clone. | ||||
| * | | | | | Restore old beahvior on clone. | Henning Baldersheim | 2017-08-28 | 2 | -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. |