Merge branch '1.5.x' of github.com:Netflix/Hystrix into publish_via_t… · Netflix/Hystrix@916a464 · GitHub

Commit

Merge branch '1.5.x' of github.com:Netflix/Hystrix into publish_via_t…

Browse files

…ravis

# Conflicts:
#	.travis.yml

Loading branch information

elandau committed Nov 16, 2018

2 parents 14a2f76 + ed2c966 commit 916a464