niklas/cyclonedds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into security

Browse source 
Signed-off-by: Kurtulus Oksuztepe <kurtulus.oksuztepe@adlinktech.com>

Conflicts:
	.travis.yml
This commit is contained in:
Kurtulus Oksuztepe 2019-10-29 17:40:33 +01:00
commit aa3b95ee7f
39 changed files with 273 additions and 257 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -81,7 +81,7 @@ osx_xcode10_3: &osx_xcode10_3
- eval "export COV_COMPTYPE=clang COV_PLATFORM=macOSX"
- eval "export PATH=\"${PATH}:$(python3 -m site --user-base)/bin\""
install:
- pip3 install conan --upgrade --user
- python3 -m pip install conan --upgrade --user
osx_xcode9: &osx_xcode9
<<: *osx_xcode10_3