Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Exclude scala-library from provided classpath. | gjoranv | 2017-09-19 | 1 | -0/+12 |
| | | | | | - Still available in test classpath, as application has a compile scope dep. | ||||
* | Merge pull request #3446 from vespa-engine/gjoranv/exclude-icu4j | Bjørn Christian Seime | 2017-09-19 | 2 | -0/+8 |
|\ | | | | | Exclude com.ibu.icu:icu4j from provided classpath. | ||||
| * | Exclude com.ibu.icu:icu4j from provided classpath. | gjoranv | 2017-09-19 | 2 | -0/+8 |
|/ | |||||
* | Merge pull request #3443 from vespa-engine/hmusum/no-need-for-stack-trace | Martin Polden | 2017-09-19 | 1 | -2/+2 |
|\ | | | | | Message is enough, no need for stack trace | ||||
| * | Message is enough, no need for stack trace | Harald Musum | 2017-09-19 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #3442 from vespa-engine/hmusum/remove-unused-dir | Kristian Aune | 2017-09-19 | 3 | -6/+0 |
|\ \ | |/ |/| | Remove unused directory used only in previous versions | ||||
| * | Remove unused directory used only in previous versions | Harald Musum | 2017-09-18 | 3 | -6/+0 |
| | | |||||
* | | Merge pull request #3441 from ↵ | Harald Musum | 2017-09-19 | 15 | -65/+65 |
|\ \ | |/ |/| | | | | | vespa-engine/toregge/reduce-need-to-rename-config-definition-files-in-postinstall-step Reduce need to rename config definition files in post install step. | ||||
| * | Reduce need to rename config definition files in post install step. | Tor Egge | 2017-09-18 | 15 | -65/+65 |
|/ | |||||
* | Merge pull request #3439 from ↵ | Harald Musum | 2017-09-18 | 1 | -32/+0 |
|\ | | | | | | | | | vespa-engine/toregge/remove-duplicate-config-definition-installs Remove duplicate config definitions installs. | ||||
| * | Remove duplicate config definitions installs. | Tor Egge | 2017-09-18 | 1 | -32/+0 |
| | | |||||
* | | Merge pull request #3440 from vespa-engine/balder/correct-reserialization | Henning Baldersheim | 2017-09-18 | 2 | -22/+16 |
|\ \ | | | | | | | Balder/correct reserialization | ||||
| * | | There is no need to do an extra serialize/deserialize. | Henning Baldersheim | 2017-09-18 | 1 | -3/+1 |
| | | | |||||
| * | | C++ for loop and some syntax/white space, no semantic changes | Henning Baldersheim | 2017-09-18 | 1 | -19/+15 |
|/ / | |||||
* | | Merge pull request #3423 from ↵ | Bjørn Christian Seime | 2017-09-18 | 2 | -161/+9 |
|\ \ | |/ |/| | | | | | vespa-engine/hakon/remove-current-thread-restriction-on-orchestrator-lock Remove current-thread restriction on Orchestrator lock | ||||
| * | Remove 2 | Håkon Hallingstad | 2017-09-18 | 1 | -2/+2 |
| | | |||||
| * | Remove current-thread restriction on Orchestrator lock | Håkon Hallingstad | 2017-09-15 | 2 | -161/+9 |
| | | |||||
* | | Merge pull request #3438 from vespa-engine/toregge/run-post-install-script-last | Arnstein Ressem | 2017-09-18 | 2 | -3/+5 |
|\ \ | | | | | | | Try to run post_install.sh later by placing the install statement in | ||||
| * | | Try to run post_install.sh later by placing the install statement in | Tor Egge | 2017-09-18 | 2 | -3/+5 |
| | | | | | | | | | | | | the last subdirectory added. | ||||
* | | | Merge pull request #3436 from vespa-engine/gjoranv/exclude-xerces | gjoranv | 2017-09-18 | 2 | -0/+8 |
|\ \ \ | |/ / |/| | | Exclude xerces:xercesImpl from provided classpath. | ||||
| * | | Exclude xerces:xercesImpl from provided classpath. | gjoranv | 2017-09-18 | 2 | -0/+8 |
|/ / | |||||
* | | Merge pull request #3434 from ↵ | Tor Egge | 2017-09-18 | 1 | -0/+2 |
|\ \ | | | | | | | | | | | | | vespa-engine/hmusum/generate-and-install-routing.def Generate and install routing.def | ||||
| * | | Generate and install routing.def | Harald Musum | 2017-09-18 | 1 | -0/+2 |
| | | | |||||
* | | | Merge pull request #3433 from ↵ | Tor Egge | 2017-09-18 | 1 | -31/+0 |
|\ \ \ | |/ / |/| | | | | | | | | vespa-engine/hmusum/update-after-orchestrator.def-move Update after orchestrator.def move | ||||
| * | | Remove stale comment | Harald Musum | 2017-09-18 | 1 | -1/+0 |
| | | | |||||
| * | | def files from configdefinitions are already installed in that module | Harald Musum | 2017-09-18 | 1 | -31/+0 |
| | | | |||||
| * | | Update after orchestrator.def move | Harald Musum | 2017-09-18 | 2 | -1/+2 |
| | | | |||||
* | | | Merge pull request #3432 from ↵ | Arnstein Ressem | 2017-09-18 | 13 | -92/+52 |
|\ \ \ | | | | | | | | | | | | | | | | | vespa-engine/revert-3418-hmusum/upgrade-to-curator-2.12.0 Revert "Upgrade to Curator 2.12.0" | ||||
| * | | | Revert "Upgrade to Curator 2.12.0" | Harald Musum | 2017-09-18 | 13 | -92/+52 |
|/ / / | |||||
* | | | Merge pull request #3431 from ↵ | Harald Musum | 2017-09-18 | 21 | -23/+23 |
|\ \ \ | | | | | | | | | | | | | | | | | vespa-engine/hmusum/filter-on-correct-package-prefix-for-curator Filter log on correct package prefix for Curator | ||||
| * | | | Filter on correct package prefix for Curator | Harald Musum | 2017-09-17 | 21 | -23/+23 |
| |/ / | |||||
* | | | Merge pull request #3314 from ↵ | Arnstein Ressem | 2017-09-18 | 2 | -10/+11 |
|\ \ \ | | | | | | | | | | | | | | | | | vespa-engine/hmusum/only-create-hosted-vespa-tenant-on-hosted Only create hosted-vespa tenant on hosted installations | ||||
| * | | | Merge branch 'master' into hmusum/only-create-hosted-vespa-tenant-on-hosted | Harald Musum | 2017-09-17 | 691 | -4706/+7676 |
| |\| | | |||||
| * | | | Only create hosted-vespa tenant on hosted installations | Harald Musum | 2017-09-04 | 2 | -10/+11 |
| | | | | |||||
* | | | | Merge pull request #3418 from vespa-engine/hmusum/upgrade-to-curator-2.12.0 | Harald Musum | 2017-09-18 | 13 | -52/+92 |
|\ \ \ \ | |_|/ / |/| | | | Upgrade to Curator 2.12.0 | ||||
| * | | | Upgrade to Curator 2.12.0 | Harald Musum | 2017-09-15 | 13 | -52/+92 |
| | | | | |||||
* | | | | Merge pull request #3430 from ↵ | Jon Bratseth | 2017-09-17 | 6 | -1/+17 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | vespa-engine/revert-3357-revert-3354-musum/move-orchestrator-config-definition Revert 3357 revert 3354 musum/move orchestrator config definition | ||||
| * | | | | Move orchestrator config to itw own package | Harald Musum | 2017-09-16 | 4 | -1/+9 |
| | | | | | |||||
| * | | | | Revert "Revert "Move orchestrator.def to configdefinititions/"" | Harald Musum | 2017-09-11 | 3 | -0/+8 |
| | | | | | |||||
* | | | | | Merge pull request #3429 from ↵ | Henning Baldersheim | 2017-09-16 | 2 | -3/+10 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/toregge/fixup-notify-putdone-remove-removedone-issues-pass2 Handle out of order put operations while tracking pending remove. | ||||
| * | | | | | Handle out of order put operations while tracking pending remove. | Tor Egge | 2017-09-15 | 2 | -3/+10 |
|/ / / / / | |||||
* | | | | | Merge pull request #3419 from ↵ | Henning Baldersheim | 2017-09-15 | 21 | -117/+256 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | vespa-engine/toregge/fixup-notify-putdone-remove-removedone-issues Toregge/fixup notify putdone remove removedone issues | ||||
| * | | | | | Use a new fixture for the last 4 tests to reduce amount of duplicated code. | Tor Egge | 2017-09-15 | 1 | -41/+48 |
| | | | | | | |||||
| * | | | | | Add newline. | Tor Egge | 2017-09-15 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | Keep RemoveDoneContext and RemoveBatchDoneDontext live until summary write | Tor Egge | 2017-09-15 | 2 | -5/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | has completed. | ||||
| * | | | | | Handle delayed calls to notifyRemoveDone() in gid to lid change handler. | Tor Egge | 2017-09-15 | 3 | -8/+73 |
| | | | | | | |||||
| * | | | | | Simplify logic about when to call notifyRemoveDone() on gid to lid change ↵ | Tor Egge | 2017-09-15 | 7 | -51/+116 |
| | | | | | | | | | | | | | | | | | | | | | | | | handler. | ||||
| * | | | | | Rename notifyPut to notifyPutDone since notification happens after | Tor Egge | 2017-09-15 | 14 | -32/+32 |
| | | | | | | | | | | | | | | | | | | | | | | | | data structures have been updated. | ||||
* | | | | | | Merge pull request #3428 from vespa-engine/gjoranv/exclude-commons-collections | gjoranv | 2017-09-15 | 2 | -1/+20 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Exclude commons-collections from provided classpath. | ||||
| * | | | | | | Exclude commons-collections from provided classpath. | gjoranv | 2017-09-15 | 2 | -1/+20 |
| | | | | | | |