diff options
| author | Henning Baldersheim <balder@oath.com> | 2018-08-07 22:39:59 +0200 |
|---|---|---|
| committer | Henning Baldersheim <balder@oath.com> | 2018-08-07 22:39:59 +0200 |
| commit | 2501dbc55ccb50fa757fe8d3b5c0bf0e883a2682 (patch) | |
| tree | e6a8b1a14aa6aaa6385f952f9ff6885e463a7880 | |
| parent | 34406ceff949b9b0f0e7db531f519c5ebbe309cf (diff) | |
| parent | 2896b45882d74db481ac9dd2e1695835ddef2aaf (diff) | |
Merge branch 'balder/do-not-follow-nullptr' of github.com:vespa-engine/vespa into balder/do-not-follow-nullptr
Conflicts:
searchcore/src/vespa/searchcore/proton/server/fast_access_feed_view.cpp
0 files changed, 0 insertions, 0 deletions