Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge pull request #3346 from vespa-engine/gjoranv/remove-commons-lang | Bjørn Christian Seime | 2017-09-06 | 2 | -0/+33 | |
|\ \ \ \ | ||||||
| * | | | | Add direct deps on jdisc_http_service and vespajlib. | gjoranv | 2017-09-06 | 1 | -0/+11 | |
| * | | | | Remove commons-lang (2+3) as visible deps from container-dev. | gjoranv | 2017-09-06 | 1 | -0/+22 | |
* | | | | | Merge pull request #3343 from vespa-engine/mpolden/use-alias-in-record-lookup | Morten Tokle | 2017-09-06 | 4 | -10/+38 | |
|\ \ \ \ \ | ||||||
| * | | | | | Use alias in record lookup | Martin Polden | 2017-09-06 | 4 | -10/+38 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge pull request #3342 from vespa-engine/bratseth/persist-after-remove | Martin Polden | 2017-09-06 | 3 | -6/+7 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Persist after remove | Jon Bratseth | 2017-09-06 | 3 | -6/+7 | |
|/ / / / | ||||||
* | | | | Merge pull request #3338 from vespa-engine/toregge/use-std-lower-bound | Geir Storli | 2017-09-06 | 1 | -6/+3 | |
|\ \ \ \ | ||||||
| * | | | | Simplify lower_bound method. | Tor Egge | 2017-09-06 | 1 | -6/+3 | |
|/ / / / | ||||||
* | | | | Merge pull request #3336 from vespa-engine/balder/request-shutdown-instead-of... | Tor Brede Vekterli | 2017-09-06 | 8 | -37/+23 | |
|\ \ \ \ | ||||||
| * | | | | Align members | Henning Baldersheim | 2017-09-05 | 3 | -6/+2 | |
| * | | | | WE must listen to everyone who wants to stop. | Henning Baldersheim | 2017-09-05 | 6 | -28/+19 | |
| * | | | | Request shutdown instead of doing a std::quick_exit. | Henning Baldersheim | 2017-09-05 | 1 | -3/+2 | |
* | | | | | Merge pull request #3334 from vespa-engine/toregge/use-gid-to-lid-change-hand... | Geir Storli | 2017-09-06 | 25 | -179/+250 | |
|\ \ \ \ \ | ||||||
| * | | | | | Remove commented out method. | Tor Egge | 2017-09-06 | 1 | -1/+0 | |
| * | | | | | Move API comments from implementation headers to interface header. | Tor Egge | 2017-09-06 | 3 | -25/+11 | |
| * | | | | | Remove dead code. | Tor Egge | 2017-09-05 | 2 | -57/+0 | |
| * | | | | | Adjust usage of gid to lid change handler: | Tor Egge | 2017-09-05 | 7 | -46/+104 | |
| * | | | | | Correct lookupDocId method declaration. | Tor Egge | 2017-09-05 | 1 | -1/+1 | |
| * | | | | | Use gid to lid change handler interface directly. | Tor Egge | 2017-09-05 | 4 | -42/+7 | |
| * | | | | | Add dummy gid to lid change handler. | Tor Egge | 2017-09-05 | 16 | -29/+149 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge pull request #3335 from vespa-engine/gjoranv/use-Java-createClassName | gjoranv | 2017-09-06 | 3 | -6/+7 | |
|\ \ \ \ \ | ||||||
| * | | | | | Revert "Keep using the deprecated createClassName method for now." | gjoranv | 2017-09-05 | 3 | -6/+7 | |
* | | | | | | Merge pull request #3327 from vespa-engine/revert-3308-revert-2934-hmusum/use... | Harald Musum | 2017-09-06 | 5 | -15/+44 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Revert "Revert "Return 409 if there is a conflict when activating"" | Harald Musum | 2017-09-05 | 5 | -15/+44 | |
* | | | | | | | Merge pull request #3337 from vespa-engine/balder/tell-how-long-it-waited | Jon Bratseth | 2017-09-06 | 2 | -1/+2 | |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | ||||||
| * | | | | | | Add the timeout in the message too. | Henning Baldersheim | 2017-09-05 | 2 | -1/+2 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #3332 from vespa-engine/revert-3325-balder/request-shutdow... | Henning Baldersheim | 2017-09-05 | 1 | -2/+3 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Revert "Request shutdown instead of doing a std::quick_exit." | Henning Baldersheim | 2017-09-05 | 1 | -2/+3 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #3331 from vespa-engine/vekterli/evict-merge-throttler-que... | Tor Brede Vekterli | 2017-09-05 | 3 | -10/+45 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | ||||||
| * | | | | | Evict all queued merges from throttler on backpressure | Tor Brede Vekterli | 2017-09-05 | 3 | -10/+45 | |
* | | | | | | Merge pull request #3328 from vespa-engine/mpolden/remove-fest-assert | Jon Bratseth | 2017-09-05 | 4 | -37/+38 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | ||||||
| * | | | | | Remove fest-assert | Martin Polden | 2017-09-05 | 4 | -37/+38 | |
* | | | | | | Merge pull request #3330 from vespa-engine/bjorncs/tagging | Bjørn Christian Seime | 2017-09-05 | 1 | -4/+0 | |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | ||||||
| * | | | | | Don't create duplicate tag | Bjørn Christian Seime | 2017-09-05 | 1 | -4/+0 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #3329 from vespa-engine/gjoranv/createClassName | gjoranv | 2017-09-05 | 6 | -18/+57 | |
|\ \ \ \ \ | ||||||
| * | | | | | Keep using the deprecated createClassName method for now. | gjoranv | 2017-09-05 | 3 | -7/+6 | |
| * | | | | | Rewrite ConfigGenerator.createClassName to Java. | gjoranv | 2017-09-05 | 7 | -24/+64 | |
* | | | | | | Merge pull request #3319 from vespa-engine/jvenstad/use-git-ref-not-tag-for-rpm | Bjørn Christian Seime | 2017-09-05 | 1 | -4/+9 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Create and push git tag for release | Bjørn Christian Seime | 2017-09-05 | 1 | -0/+4 | |
| * | | | | | | Use git ref, which must be supplied | Jon Marius Venstad | 2017-09-04 | 1 | -4/+5 | |
* | | | | | | | Merge pull request #3325 from vespa-engine/balder/request-shutdown-instead-of... | Tor Brede Vekterli | 2017-09-05 | 1 | -3/+2 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | Request shutdown instead of doing a std::quick_exit. | Henning Baldersheim | 2017-09-05 | 1 | -3/+2 | |
| | |_|_|/ / | |/| | | | | ||||||
* | | | | | | Merge pull request #3287 from vespa-engine/revert-3275-revert-3260-hmusum/rem... | gjoranv | 2017-09-05 | 117 | -120/+1 | |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | ||||||
| * | | | | | Merge branch 'master' into revert-3275-revert-3260-hmusum/remove-version-from... | Harald Musum | 2017-08-31 | 135 | -401/+586 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'master' into revert-3275-revert-3260-hmusum/remove-version-from... | Harald Musum | 2017-08-30 | 14 | -132/+266 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | Update test after removing version line | Harald Musum | 2017-08-30 | 1 | -2/+1 | |
| * | | | | | | | Revert "Revert "version in def files are deprecated"" | Harald Musum | 2017-08-30 | 116 | -118/+0 | |
* | | | | | | | | Merge pull request #3321 from vespa-engine/freva/image-pull-async-bug | Valerij Fredriksen | 2017-09-05 | 2 | -8/+84 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix pull async bug, add test | valerijf | 2017-09-04 | 2 | -8/+84 | |
| | |_|_|_|_|_|/ | |/| | | | | | |