summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Move orchestrator.def to configdefinititions/Harald Musum2017-09-063-0/+8
* Merge pull request #3348 from vespa-engine/arnej/add-metrics-display-namegjoranv2017-09-065-6/+31
|\
| * unit test "display-name"Arne Juul2017-09-051-2/+13
| * escape japaneseArne Juul2017-09-051-1/+1
| * add "display-name" attribute for metricsArne Juul2017-09-053-3/+17
* | Merge pull request #3347 from vespa-engine/bjorncs/bootstrapLester Solbakken2017-09-061-0/+4
|\ \
| * | Add some user output to bootstrap scriptBjørn Christian Seime2017-09-061-0/+4
* | | Merge pull request #3346 from vespa-engine/gjoranv/remove-commons-langBjørn Christian Seime2017-09-062-0/+33
|\ \ \
| * | | Add direct deps on jdisc_http_service and vespajlib.gjoranv2017-09-061-0/+11
| * | | Remove commons-lang (2+3) as visible deps from container-dev.gjoranv2017-09-061-0/+22
* | | | Merge pull request #3343 from vespa-engine/mpolden/use-alias-in-record-lookupMorten Tokle2017-09-064-10/+38
|\ \ \ \
| * | | | Use alias in record lookupMartin Polden2017-09-064-10/+38
| | |/ / | |/| |
* | | | Merge pull request #3342 from vespa-engine/bratseth/persist-after-removeMartin Polden2017-09-063-6/+7
|\ \ \ \ | |_|/ / |/| | |
| * | | Persist after removeJon Bratseth2017-09-063-6/+7
|/ / /
* | | Merge pull request #3338 from vespa-engine/toregge/use-std-lower-boundGeir Storli2017-09-061-6/+3
|\ \ \
| * | | Simplify lower_bound method.Tor Egge2017-09-061-6/+3
|/ / /
* | | Merge pull request #3336 from vespa-engine/balder/request-shutdown-instead-of...Tor Brede Vekterli2017-09-068-37/+23
|\ \ \
| * | | Align membersHenning Baldersheim2017-09-053-6/+2
| * | | WE must listen to everyone who wants to stop.Henning Baldersheim2017-09-056-28/+19
| * | | Request shutdown instead of doing a std::quick_exit.Henning Baldersheim2017-09-051-3/+2
* | | | Merge pull request #3334 from vespa-engine/toregge/use-gid-to-lid-change-hand...Geir Storli2017-09-0625-179/+250
|\ \ \ \
| * | | | Remove commented out method.Tor Egge2017-09-061-1/+0
| * | | | Move API comments from implementation headers to interface header.Tor Egge2017-09-063-25/+11
| * | | | Remove dead code.Tor Egge2017-09-052-57/+0
| * | | | Adjust usage of gid to lid change handler:Tor Egge2017-09-057-46/+104
| * | | | Correct lookupDocId method declaration.Tor Egge2017-09-051-1/+1
| * | | | Use gid to lid change handler interface directly.Tor Egge2017-09-054-42/+7
| * | | | Add dummy gid to lid change handler.Tor Egge2017-09-0516-29/+149
| | |/ / | |/| |
* | | | Merge pull request #3335 from vespa-engine/gjoranv/use-Java-createClassNamegjoranv2017-09-063-6/+7
|\ \ \ \
| * | | | Revert "Keep using the deprecated createClassName method for now."gjoranv2017-09-053-6/+7
* | | | | Merge pull request #3327 from vespa-engine/revert-3308-revert-2934-hmusum/use...Harald Musum2017-09-065-15/+44
|\ \ \ \ \
| * | | | | Revert "Revert "Return 409 if there is a conflict when activating""Harald Musum2017-09-055-15/+44
* | | | | | Merge pull request #3337 from vespa-engine/balder/tell-how-long-it-waitedJon Bratseth2017-09-062-1/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Add the timeout in the message too.Henning Baldersheim2017-09-052-1/+2
|/ / / / /
* | | | | Merge pull request #3332 from vespa-engine/revert-3325-balder/request-shutdow...Henning Baldersheim2017-09-051-2/+3
|\ \ \ \ \
| * | | | | Revert "Request shutdown instead of doing a std::quick_exit."Henning Baldersheim2017-09-051-2/+3
|/ / / / /
* | | | | Merge pull request #3331 from vespa-engine/vekterli/evict-merge-throttler-que...Tor Brede Vekterli2017-09-053-10/+45
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Evict all queued merges from throttler on backpressureTor Brede Vekterli2017-09-053-10/+45
* | | | | Merge pull request #3328 from vespa-engine/mpolden/remove-fest-assertJon Bratseth2017-09-054-37/+38
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Remove fest-assertMartin Polden2017-09-054-37/+38
* | | | | Merge pull request #3330 from vespa-engine/bjorncs/taggingBjørn Christian Seime2017-09-051-4/+0
|\ \ \ \ \
| * | | | | Don't create duplicate tagBjørn Christian Seime2017-09-051-4/+0
|/ / / / /
* | | | | Merge pull request #3329 from vespa-engine/gjoranv/createClassNamegjoranv2017-09-056-18/+57
|\ \ \ \ \
| * | | | | Keep using the deprecated createClassName method for now.gjoranv2017-09-053-7/+6
| * | | | | Rewrite ConfigGenerator.createClassName to Java.gjoranv2017-09-057-24/+64
* | | | | | Merge pull request #3319 from vespa-engine/jvenstad/use-git-ref-not-tag-for-rpmBjørn Christian Seime2017-09-051-4/+9
|\ \ \ \ \ \
| * | | | | | Create and push git tag for releaseBjørn Christian Seime2017-09-051-0/+4
| * | | | | | Use git ref, which must be suppliedJon Marius Venstad2017-09-041-4/+5
* | | | | | | Merge pull request #3325 from vespa-engine/balder/request-shutdown-instead-of...Tor Brede Vekterli2017-09-051-3/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Request shutdown instead of doing a std::quick_exit.Henning Baldersheim2017-09-051-3/+2
| | |_|_|/ / | |/| | | |