Merge branch 'dev' into edge

This commit is contained in:
Adam Ierymenko 2019-08-26 11:09:19 -07:00
commit b6d7a95028
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
7 changed files with 14 additions and 13 deletions

View file

@ -403,7 +403,7 @@ debian-clean: FORCE
rm -rf debian/files debian/zerotier-one*.debhelper debian/zerotier-one.substvars debian/*.log debian/zerotier-one debian/.debhelper debian/debhelper-build-stamp
redhat: FORCE
rpmbuild -ba zerotier-one.spec
rpmbuild --target `rpm -q bash --qf "%{arch}"` -ba zerotier-one.spec
# This installs the packages needed to build ZT locally on CentOS 7 and
# is here largely for documentation purposes.