Skip to content
This repository has been archived by the owner on Sep 18, 2021. It is now read-only.

Commit

Permalink
Merge branch 'cassie_09x'
Browse files Browse the repository at this point in the history
Conflicts:
	CHANGELOG
	project/build.properties
	project/release.properties
  • Loading branch information
ryanking committed Jun 23, 2011
2 parents c4997c8 + 1e44489 commit 57fbf9a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG
@@ -1,3 +1,4 @@

# 0.10.0
* no more implicits for codecs
* removed redundant codecs. going forward we'll use one codec per datatype.
Expand All @@ -7,6 +8,9 @@
don't use counters)
* make it possible to iterate over the columns in a row (by @iano)

# 0.9.3
* upgrade util-core dependency

# 0.9.2
* upgrade to finagle 1.6.1

Expand Down
5 changes: 3 additions & 2 deletions project/build/Cassie.scala
Expand Up @@ -15,7 +15,8 @@ class Cassie(info: sbt.ProjectInfo) extends StandardParentProject(info)
new HadoopProject(_), coreProject)

class CoreProject(info: ProjectInfo) extends StandardLibraryProject(info)
with SubversionPublisher with AdhocInlines with CompileThriftFinagle with PublishSite {
with SubversionPublisher with AdhocInlines with CompileThriftFinagle with PublishSite
with NoisyDependencies {

override def subversionRepository = Some("http://svn.local.twitter.com/maven/")

Expand All @@ -35,7 +36,7 @@ class Cassie(info: sbt.ProjectInfo) extends StandardParentProject(info)
val finagle = "com.twitter" % "finagle-core" % finagleVersion
val finagleThrift = "com.twitter" % "finagle-thrift" % finagleVersion
val finagleOstrich = "com.twitter" % "finagle-ostrich4" % finagleVersion
val utilCore = "com.twitter" % "util-core" % "1.8.12"
val utilCore = "com.twitter" % "util-core" % "1.8.18"

val slf4jNop = "org.slf4j" % "slf4j-nop" % slf4jVersion % "provided"

Expand Down

0 comments on commit 57fbf9a

Please sign in to comment.