Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift
diff --git a/.gitignore b/.gitignore
index 0c44429..8c4ba8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@
*.swp
.project
.pydevproject
+.sonar
.DS_Store
/Makefile
diff --git a/Makefile.am b/Makefile.am
old mode 100644
new mode 100755
index 54c45a2..f7758af
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,9 +34,13 @@
@echo $(VERSION)
EXTRA_DIST = \
- doc \
- tutorial \
+ .travis.yml \
contrib \
+ doc \
+ doap.rdf \
+ sonar-project.properties \
+ tutorial \
+ Vagrantfile \
LICENSE \
CHANGES \
NOTICE
diff --git a/compiler/cpp/src/generate/t_js_generator.cc b/compiler/cpp/src/generate/t_js_generator.cc
index bff6423..e27f5de 100644
--- a/compiler/cpp/src/generate/t_js_generator.cc
+++ b/compiler/cpp/src/generate/t_js_generator.cc
@@ -270,7 +270,8 @@
// Print header
f_types_ <<
autogen_comment() <<
- js_includes() << endl;
+ js_includes() << endl <<
+ render_includes() << endl;
if (gen_node_) {
f_types_ << "var ttypes = module.exports = {};" << endl;
diff --git a/debian/docs b/debian/docs
index 50bd824..e845566 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,2 +1 @@
-NEWS
README