Merge pull request twitter#365 from twitter/bumpTo2114

Bump from 2.11.2 to 2.11.4
snoble · Dec 3, 2014 · 7fae6f3 · 7fae6f3
2 parents 25c0526 + da62e74
commit 7fae6f3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,4 @@
 language: scala
 scala:
   - 2.10.4
-  - 2.11.2
+  - 2.11.4
diff --git a/project/Build.scala b/project/Build.scala
@@ -12,7 +12,7 @@ object AlgebirdBuild extends Build {
   val sharedSettings = Project.defaultSettings ++ scalariformSettings ++  Seq(
     organization := "com.twitter",
     scalaVersion := "2.10.4",
-    crossScalaVersions := Seq("2.10.4", "2.11.2"),
+    crossScalaVersions := Seq("2.10.4", "2.11.4"),
     ScalariformKeys.preferences := formattingPreferences,
 
     resolvers ++= Seq(