Merge branch 'master' of github.com:twitter/finagle

twitter · Feb 14, 2011 · 38cf56a · 38cf56a
2 parents 0814cdc + 0f4c685
commit 38cf56a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/finagle-core/src/main/scala/com/twitter/finagle/builder/Ssl.scala b/finagle-core/src/main/scala/com/twitter/finagle/builder/Ssl.scala
@@ -232,10 +232,11 @@ object Ssl {
     if (context == null) {
       try {
         context = factory.context(certificatePath, keyPath)
+        log.log(Level.INFO, "SSL provider '%s' was used".format(factory.name()))
       } catch {
         case e: Throwable =>
           log.log(Level.WARNING, "Provider '%s' not suitable".format(factory.name()))
-          log.log(Level.INFO, e.getMessage, e)
+          log.log(Level.FINEST, e.getMessage, e)
       }
     }
 

diff --git a/project/build.properties b/project/build.properties
@@ -1,8 +1,8 @@
 #Project properties
-#Thu Feb 10 14:51:12 PST 2011
+#Fri Feb 11 12:06:05 PST 2011
 project.organization=com.twitter
 project.name=finagle
 sbt.version=0.7.4
-project.version=1.1.21-SNAPSHOT
+project.version=1.1.22-SNAPSHOT
 build.scala.versions=2.8.1
 project.initialize=false