Merge branch 'os_detection_fix' of https://github.com/kstyrc/embedded… · jasonCodesAway/embedded-redis@e5b0cae · GitHub

Commit

Merge branch 'os_detection_fix' of https://github.com/kstyrc/embedded…

Browse files

…-redis into os_detection_fix

Conflicts:
	src/main/java/redis/embedded/RedisServer.java
	src/main/java/redis/embedded/util/OSDetector.java

Loading branch information

kstyrc committed Feb 21, 2015

2 parents 70f7b00 + e3e5fde commit e5b0cae