aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Exclude scala-library from provided classpath.gjoranv2017-09-191-0/+12
| | | | | - Still available in test classpath, as application has a compile scope dep.
* Merge pull request #3446 from vespa-engine/gjoranv/exclude-icu4jBjørn Christian Seime2017-09-192-0/+8
|\ | | | | Exclude com.ibu.icu:icu4j from provided classpath.
| * Exclude com.ibu.icu:icu4j from provided classpath.gjoranv2017-09-192-0/+8
|/
* Merge pull request #3443 from vespa-engine/hmusum/no-need-for-stack-traceMartin Polden2017-09-191-2/+2
|\ | | | | Message is enough, no need for stack trace
| * Message is enough, no need for stack traceHarald Musum2017-09-191-2/+2
| |
* | Merge pull request #3442 from vespa-engine/hmusum/remove-unused-dirKristian Aune2017-09-193-6/+0
|\ \ | |/ |/| Remove unused directory used only in previous versions
| * Remove unused directory used only in previous versionsHarald Musum2017-09-183-6/+0
| |
* | Merge pull request #3441 from ↵Harald Musum2017-09-1915-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 Egge2017-09-1815-65/+65
|/
* Merge pull request #3439 from ↵Harald Musum2017-09-181-32/+0
|\ | | | | | | | | vespa-engine/toregge/remove-duplicate-config-definition-installs Remove duplicate config definitions installs.
| * Remove duplicate config definitions installs.Tor Egge2017-09-181-32/+0
| |
* | Merge pull request #3440 from vespa-engine/balder/correct-reserializationHenning Baldersheim2017-09-182-22/+16
|\ \ | | | | | | Balder/correct reserialization
| * | There is no need to do an extra serialize/deserialize.Henning Baldersheim2017-09-181-3/+1
| | |
| * | C++ for loop and some syntax/white space, no semantic changesHenning Baldersheim2017-09-181-19/+15
|/ /
* | Merge pull request #3423 from ↵Bjørn Christian Seime2017-09-182-161/+9
|\ \ | |/ |/| | | | | vespa-engine/hakon/remove-current-thread-restriction-on-orchestrator-lock Remove current-thread restriction on Orchestrator lock
| * Remove 2Håkon Hallingstad2017-09-181-2/+2
| |
| * Remove current-thread restriction on Orchestrator lockHåkon Hallingstad2017-09-152-161/+9
| |
* | Merge pull request #3438 from vespa-engine/toregge/run-post-install-script-lastArnstein Ressem2017-09-182-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 inTor Egge2017-09-182-3/+5
| | | | | | | | | | | | the last subdirectory added.
* | | Merge pull request #3436 from vespa-engine/gjoranv/exclude-xercesgjoranv2017-09-182-0/+8
|\ \ \ | |/ / |/| | Exclude xerces:xercesImpl from provided classpath.
| * | Exclude xerces:xercesImpl from provided classpath.gjoranv2017-09-182-0/+8
|/ /
* | Merge pull request #3434 from ↵Tor Egge2017-09-181-0/+2
|\ \ | | | | | | | | | | | | vespa-engine/hmusum/generate-and-install-routing.def Generate and install routing.def
| * | Generate and install routing.defHarald Musum2017-09-181-0/+2
| | |
* | | Merge pull request #3433 from ↵Tor Egge2017-09-181-31/+0
|\ \ \ | |/ / |/| | | | | | | | vespa-engine/hmusum/update-after-orchestrator.def-move Update after orchestrator.def move
| * | Remove stale commentHarald Musum2017-09-181-1/+0
| | |
| * | def files from configdefinitions are already installed in that moduleHarald Musum2017-09-181-31/+0
| | |
| * | Update after orchestrator.def moveHarald Musum2017-09-182-1/+2
| | |
* | | Merge pull request #3432 from ↵Arnstein Ressem2017-09-1813-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 Musum2017-09-1813-92/+52
|/ / /
* | | Merge pull request #3431 from ↵Harald Musum2017-09-1821-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 CuratorHarald Musum2017-09-1721-23/+23
| |/ /
* | | Merge pull request #3314 from ↵Arnstein Ressem2017-09-182-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-hostedHarald Musum2017-09-17691-4706/+7676
| |\| |
| * | | Only create hosted-vespa tenant on hosted installationsHarald Musum2017-09-042-10/+11
| | | |
* | | | Merge pull request #3418 from vespa-engine/hmusum/upgrade-to-curator-2.12.0Harald Musum2017-09-1813-52/+92
|\ \ \ \ | |_|/ / |/| | | Upgrade to Curator 2.12.0
| * | | Upgrade to Curator 2.12.0Harald Musum2017-09-1513-52/+92
| | | |
* | | | Merge pull request #3430 from ↵Jon Bratseth2017-09-176-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 packageHarald Musum2017-09-164-1/+9
| | | | |
| * | | | Revert "Revert "Move orchestrator.def to configdefinititions/""Harald Musum2017-09-113-0/+8
| | | | |
* | | | | Merge pull request #3429 from ↵Henning Baldersheim2017-09-162-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 Egge2017-09-152-3/+10
|/ / / / /
* | | | | Merge pull request #3419 from ↵Henning Baldersheim2017-09-1521-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 Egge2017-09-151-41/+48
| | | | | |
| * | | | | Add newline.Tor Egge2017-09-151-1/+2
| | | | | |
| * | | | | Keep RemoveDoneContext and RemoveBatchDoneDontext live until summary writeTor Egge2017-09-152-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | has completed.
| * | | | | Handle delayed calls to notifyRemoveDone() in gid to lid change handler.Tor Egge2017-09-153-8/+73
| | | | | |
| * | | | | Simplify logic about when to call notifyRemoveDone() on gid to lid change ↵Tor Egge2017-09-157-51/+116
| | | | | | | | | | | | | | | | | | | | | | | | handler.
| * | | | | Rename notifyPut to notifyPutDone since notification happens afterTor Egge2017-09-1514-32/+32
| | | | | | | | | | | | | | | | | | | | | | | | data structures have been updated.
* | | | | | Merge pull request #3428 from vespa-engine/gjoranv/exclude-commons-collectionsgjoranv2017-09-152-1/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | Exclude commons-collections from provided classpath.
| * | | | | | Exclude commons-collections from provided classpath.gjoranv2017-09-152-1/+20
| | | | | | |