Merge pull request #814 from mattrjacobs/upgrade-rx-1-0-12

mattrjacobs · mattrjacobs · commit cc53cb8887dd · 2015-06-10T16:53:45.000-07:00
Upgrade to RxJava 1.0.12
diff --git a/hystrix-core/build.gradle b/hystrix-core/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'me.champeau.gradle.jmh'
 
 dependencies {
     compile 'com.netflix.archaius:archaius-core:0.4.1'
-    compile 'io.reactivex:rxjava:1.0.10'
+    compile 'io.reactivex:rxjava:1.0.12'
     compile 'org.slf4j:slf4j-api:1.7.0'
     testCompile 'junit:junit-dep:4.10'
 }

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ apply plugin: 'me.champeau.gradle.jmh'`
`3`	`3`
`4`	`4`	`dependencies {`
`5`	`5`	`compile 'com.netflix.archaius:archaius-core:0.4.1'`
`6`		`- compile 'io.reactivex:rxjava:1.0.10'`
	`6`	`+ compile 'io.reactivex:rxjava:1.0.12'`
`7`	`7`	`compile 'org.slf4j:slf4j-api:1.7.0'`
`8`	`8`	`testCompile 'junit:junit-dep:4.10'`
`9`	`9`	`}`