From: Henrique Mendonça <henrique@apache.org>
Date: Fri, 20 Sep 2013 15:15:55 +0000 (+0200)
Subject: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=e594dccc85740ecc1d61f236e9135c5b90301d31;p=common%2Fthrift.git

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift

Conflicts:
	lib/nodejs/lib/thrift/static_server.js
---

e594dccc85740ecc1d61f236e9135c5b90301d31
diff --cc lib/nodejs/lib/thrift/static_server.js
index 0895c609,16273283..a1d2eaa6
--- a/lib/nodejs/lib/thrift/static_server.js
+++ b/lib/nodejs/lib/thrift/static_server.js
@@@ -125,7 -125,7 +125,7 @@@ exports.createStaticHttpThriftServer = 
        }
       
        fs.readFile(filename, "binary", function(err, file) {
-         if (err) {        
 -        if(err) {        
++        if (err) {
            response.writeHead(500);
            response.end(err + "\n");
            return;