Merge branch 'dev'

Netflix · Oct 13, 2018 · 89f4c21 · 89f4c21
2 parents 9e6b121 + fe7d187
commit 89f4c21
Show file tree

Hide file tree

Showing 50 changed files with 7,610 additions and 927 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,4 +16,6 @@ dump.rdb
 .idea
 *.iml
 out/
+bin/
+target/
 .DS_Store
diff --git a/build.gradle b/build.gradle
@@ -26,6 +26,11 @@ allprojects {
 
     repositories {
         jcenter()
+
+        // oss-candidate for -rc.* verions:
+        maven {
+            url "https://dl.bintray.com/netflixoss/oss-candidate"
+        }
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,4 +16,6 @@ dump.rdb @@
     .idea
     *.iml
     out/
+    bin/
+    target/
     .DS_Store