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

[henrique]

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

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


Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/e594dccc
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/e594dccc
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/e594dccc

Branch: refs/heads/master
Commit: e594dccc85740ecc1d61f236e9135c5b90301d31
Parents: a9e6248 7cf085e
Author: Henrique Mendonça <henri...@apache.org>
Authored: Fri Sep 20 17:15:55 2013 +0200
Committer: Henrique Mendonça <henri...@apache.org>
Committed: Fri Sep 20 17:15:55 2013 +0200

----------------------------------------------------------------------
 lib/nodejs/lib/thrift/static_server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/thrift/blob/e594dccc/lib/nodejs/lib/thrift/static_server.js
----------------------------------------------------------------------
diff --cc lib/nodejs/lib/thrift/static_server.js
index 0895c60,1627328..a1d2eaa
--- 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;