Merge pull request #534 from mattrjacobs/bump_master_to_rx_1_0_4

Bump RxJava to 1.0.4
Netflix · Jan 21, 2015 · 5bc87dc · 5bc87dc
2 parents 7e49a23 + fe0a757
commit 5bc87dc
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/hystrix-core/build.gradle b/hystrix-core/build.gradle
@@ -5,7 +5,7 @@ apply plugin: 'osgi'
 
 dependencies {
     compile 'com.netflix.archaius:archaius-core:0.4.1'
-    compile 'io.reactivex:rxjava:1.0.2'
+    compile 'io.reactivex:rxjava:1.0.4'
     compile 'org.slf4j:slf4j-api:1.7.0'
     testCompile 'junit:junit-dep:4.10'
 }
@@ -15,7 +15,7 @@ javadoc {
     // the exclude isn't working, nor is there a subPackages options as docs suggest there should be
     // we do not want the com.netflix.hystrix.util package include
     exclude '**/util/**'
-			
+
     options {
         doclet = "org.benjchristensen.doclet.DocletExclude"
         docletpath = [rootProject.file('./gradle/doclet-exclude.jar')]