Permalink
Browse files

merged from scala-2.9.1 branch

  • Loading branch information...
1 parent 12cd942 commit c405ff5b2faf05a1d73fd3e2d9f9feee56b3c7f3 @durgeshm committed Nov 17, 2011
View
6 project/build.properties
@@ -2,7 +2,7 @@
#Thu Sep 22 12:37:34 PDT 2011
project.organization=com.twitter
project.name=ostrich
-sbt.version=0.7.4
-project.version=4.9.4-SNAPSHOT
-build.scala.versions=2.8.1
+sbt.version=0.7.7
+project.version=2.9.1_4.9.3
+build.scala.versions=2.9.1
project.initialize=false
View
4 project/build/OstrichProject.scala
@@ -9,14 +9,14 @@ class OstrichProject(info: ProjectInfo) extends StandardLibraryProject(info)
with PublishSourcesAndJavadocs
with PublishSite
{
- val utilVersion = "1.10.2"
+ val utilVersion = "2.9.1_1.12.3"
val util = "com.twitter" % "util-core" % utilVersion
val eval = "com.twitter" % "util-eval" % utilVersion
val logging = "com.twitter" % "util-logging" % utilVersion
val json = "com.twitter" % "json_2.8.1" % "2.1.6"
// for tests:
- val specs = "org.scala-tools.testing" % "specs_2.8.1" % "1.6.6" % "test"
+ val specs = "org.scala-tools.testing" % "specs_2.9.1" % "1.6.9" % "test"
val cglib = "cglib" % "cglib" % "2.1_3" % "test"
val asm = "asm" % "asm" % "1.5.3" % "test"
val objenesis = "org.objenesis" % "objenesis" % "1.1" % "test"
View
2 src/main/scala/com/twitter/ostrich/admin/CommandHandler.scala
@@ -130,7 +130,7 @@ class CommandHandler(runtime: RuntimeEnvironment, statsCollection: StatsCollecti
}
private def getThreadStacks(): Map[String, Map[String, Map[String, Any]]] = {
- val stacks = JavaConversions.asScalaMap(Thread.getAllStackTraces()).map { case (thread, stack) =>
+ val stacks = JavaConversions.mapAsScalaMap(Thread.getAllStackTraces()).map { case (thread, stack) =>
(thread.getId().toString, immutable.Map("thread" -> thread.getName(),
"daemon" -> thread.isDaemon(),
"state" -> thread.getState(),

0 comments on commit c405ff5

Please sign in to comment.