]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c2612cf 8ea3920)
Merge pull request #25181 from smithfarm/wip-37301
authorNathan Cutler <presnypreklad@gmail.com>
Thu, 22 Nov 2018 09:12:09 +0000 (10:12 +0100)
committerGitHub <noreply@github.com>
Thu, 22 Nov 2018 09:12:09 +0000 (10:12 +0100)
build/ops: rpm: stop install-deps.sh clobbering spec file Python build setting

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Tim Serong <tserong@suse.com>
1  2 
install-deps.sh patch | diff1 | diff2 | blob | history

diff --cc install-deps.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.