summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic commit of package [vespa] release [6.151.17-1].vespa-6.151.17-1by-screwdriver2017-10-034-1/+2
* Merge pull request #3621 from vespa-engine/revert-3612-revert-3587-havardpe/a...Arnstein Ressem2017-10-0216-28/+123
|\
| * Revert "Revert "Havardpe/avoid reading past json value in slime json parser""Arnstein Ressem2017-10-0216-28/+123
* | Merge pull request #3620 from vespa-engine/bjorncs/distArnstein Ressem2017-10-021-0/+5
|\ \ | |/ |/|
| * Remove release suffix from release tagBjørn Christian Seime2017-10-021-0/+5
* | Merge pull request #3537 from vespa-engine/revert-3218-bjorncs/logging-on-rec...Bjørn Christian Seime2017-10-021-5/+2
|\ \
| * | Revert "Log on reconfig"Bjørn Christian Seime2017-09-261-5/+2
* | | Merge pull request #3617 from vespa-engine/revert-3607-hakon/enable-new-servi...Arne H Juul2017-10-021-1/+1
|\ \ \
| * | | Revert "Enable new ServiceMonitor"Arne H Juul2017-10-021-1/+1
|/ / /
* | | Merge pull request #3612 from vespa-engine/revert-3587-havardpe/avoid-reading...Håvard Pettersen2017-10-0216-123/+28
|\ \ \
| * | | Revert "Havardpe/avoid reading past json value in slime json parser"Arnstein Ressem2017-10-0216-123/+28
* | | | Merge pull request #3596 from vespa-engine/balder/remove-unused-rtcspecHenning Baldersheim2017-10-0212-112/+27
|\ \ \ \ | |/ / / |/| | |
| * | | Stay conservative and not reduce and remove ports.Henning Baldersheim2017-10-022-15/+15
| * | | Remove unused imports and imports by *.Henning Baldersheim2017-10-022-8/+12
| * | | Remove the persistenceProviderPort and ports meta for rpc and smrpHenning Baldersheim2017-09-2910-97/+29
| * | | Remove unused slime messaging port.Henning Baldersheim2017-09-292-9/+1
| * | | Remove unused rtcspec.Henning Baldersheim2017-09-292-13/+0
* | | | Merge pull request #3611 from vespa-engine/mpolden/disallow-invalid-project-idJon Bratseth2017-10-029-125/+198
|\ \ \ \
| * | | | Disallow invalid project IDMartin Polden2017-10-029-125/+198
* | | | | Merge pull request #3587 from vespa-engine/havardpe/avoid-reading-past-json-v...Geir Storli2017-10-0216-28/+123
|\ \ \ \ \
| * | | | | avoid implicit cast to boolHåvard Pettersen2017-09-2912-16/+16
| * | | | | add try_read function to mirror try_unreadHåvard Pettersen2017-09-293-5/+31
| * | | | | added unit test for InputReader::try_unreadHåvard Pettersen2017-09-291-0/+26
| * | | | | Allow empty input to preserve behaviorHåvard Pettersen2017-09-291-5/+7
| * | | | | avoid requiring that json parsing consumes all inputHåvard Pettersen2017-09-2912-18/+17
| * | | | | avoid reading extra byte after json valueHåvard Pettersen2017-09-293-0/+42
* | | | | | Merge pull request #3607 from vespa-engine/hakon/enable-new-servicemonitorHarald Musum2017-10-021-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Enable new ServiceMonitorHåkon Hallingstad2017-10-021-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #3608 from vespa-engine/bratseth/point-to-ownersKristian Aune2017-10-023-4/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Point to OWNERSJon Bratseth2017-10-021-1/+4
| * | | | Nonfunctional changes onlyJon Bratseth2017-10-022-3/+2
|/ / / /
* | | | Merge pull request #3606 from vespa-engine/mpolden/fix-unstable-testMartin Polden2017-10-023-9/+7
|\ \ \ \
| * | | | Fix unstable testMartin Polden2017-10-023-9/+7
* | | | | Merge pull request #3577 from vespa-engine/ldalves/expose-sentinel-metricsLeandro Alves2017-10-021-0/+12
|\ \ \ \ \
| * | | | | exposes sentinel metricsLeandro Alves2017-09-291-0/+12
* | | | | | Merge pull request #3605 from vespa-engine/hakon/make-orchestrator-depend-on-...Harald Musum2017-10-021-0/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Make Orchestrator depend on config model apiHåkon Hallingstad2017-10-021-0/+6
|/ / / / /
* | | | | Merge pull request #3604 from vespa-engine/aressem/avoid-premature-evaluation...Harald Musum2017-09-302-9/+9
|\ \ \ \ \
| * | | | | Escape dollar signs in the CMakeLists.txt on code execution as this is used t...Arnstein Ressem2017-09-302-9/+9
* | | | | | Merge pull request #3602 from vespa-engine/balder/do-more-indirect-commitHenning Baldersheim2017-09-3014-129/+63
|\ \ \ \ \ \
| * | | | | | Update so that the tls direct writer is not optional.Henning Baldersheim2017-09-3010-96/+40
| * | | | | | We only use the directwriter.Henning Baldersheim2017-09-305-33/+23
* | | | | | | Merge pull request #3603 from vespa-engine/balder/let-protocol-signal-sequenc...Henning Baldersheim2017-09-307-12/+24
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Be conservative if you do not know the protocol.Henning Baldersheim2017-09-301-1/+1
| * | | | | | Revert "Revert "Balder/let protocol signal sequencing requirements""Henning Baldersheim2017-09-307-12/+24
|/ / / / / /
* | | | | | Merge pull request #3593 from vespa-engine/balder/redundancy-and-searchable-c...Henning Baldersheim2017-09-301-2/+2
|\ \ \ \ \ \
| * | | | | | distribution.redundancy and distribution.searchablecopies does not require re...Henning Baldersheim2017-09-291-2/+2
* | | | | | | Merge pull request #3600 from vespa-engine/revert-3594-balder/let-protocol-si...Arnstein Ressem2017-09-307-24/+12
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Revert "Balder/let protocol signal sequencing requirements"Arnstein Ressem2017-09-307-24/+12
|/ / / / / /
* | | | | | Merge pull request #3594 from vespa-engine/balder/let-protocol-signal-sequenc...Henning Baldersheim2017-09-307-12/+24
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |