| commit | 141b548a897c2812a816b593f6a44a82ab804014 | [log] [tgz] |
|---|---|---|
| author | Saša Živkov <sasa.zivkov@sap.com> | Tue Jul 11 10:27:12 2017 +0200 |
| committer | Saša Živkov <sasa.zivkov@sap.com> | Tue Jul 11 10:31:21 2017 +0200 |
| tree | 96e860d83493ac25d3b84f9f64d193eb0342e098 | |
| parent | 3190e2d93b4578828561942be77040c0028d036e [diff] | |
| parent | 9c9ceecc47ed6ac01a2204aeb56039635bd80c2b [diff] |
Merge 9c9ceecc47 into master * commit 9c9ceecc47e: Fix standalone build, reference plugin API 2.13.9 Revert "Add support for Bazel in Gerrit tree build" This merge uses "-s ours" strategy, which keeps master unchanged. We don't want these two changes in master. The purpose of this merge is to create a merge-base for the follow-up merges. Change-Id: I408f0d93cb4085411a96e74aafbd9c6c5eae8805