Merge branch 'cassandra-3.0' into cassandra-3.11

.build/build-rat.xml

@@ -68,7 +68,10 @@
                      <exclude NAME="**/LICENSE.md"/>
             </fileset>
         </rat:report>
-        <fail message="Some files have missing or incorrect license information. Check RAT report in ${build.dir}/rat.txt for more details!">
+        <exec executable="grep" outputproperty="rat.failed.files" failifexecutionfails="false">
+            <arg line="-A5 'Unapproved licenses' ${build.dir}/rat.txt"/>
+        </exec>
+        <fail message="Some files have missing or incorrect license information. Check RAT report in ${build.dir}/rat.txt for more details! \n ${rat.failed.files}">
             <condition>
                 <and>
                     <not>

.gitignore

@@ -9,6 +9,7 @@ data/
 conf/hotspot_compiler
 doc/cql3/CQL.html
 doc/build/
+pylib/src/
 
 # C* debs
 build-stamp
@@ -27,7 +28,7 @@ debian/files
 # IntelliJ
 .idea/
 *.eml
-*.iml
+**/*.iml
 *.ipr
 *.iws