Merge branch 'cassandra-2.2' into cassandra-3.0

# Conflicts:
#	CHANGES.txt

CHANGES.txt

@@ -5,6 +5,7 @@
  * Use IF NOT EXISTS for index and UDT create statements in snapshot schema files (CASSANDRA-13935)
  * Add flag to ignore unreplicated keyspaces during repair (CASSANDRA-15160)
 Merged from 2.2:
+ * Package tools/bin scripts as executable (CASSANDRA-16151)
  * Fixed a NullPointerException when calling nodetool enablethrift (CASSANDRA-16127)
 
 3.0.22:

build.xml

@@ -1090,14 +1090,14 @@
         <!-- Shell includes in bin/ (default mode) -->
         <tarfileset dir="${dist.dir}" prefix="${final.name}">
           <include name="bin/*.in.sh" />
+          <include name="tools/bin/*.in.sh" />
         </tarfileset>
         <!-- Executable scripts in bin/ -->
         <tarfileset dir="${dist.dir}" prefix="${final.name}" mode="755">
           <include name="bin/*"/>
           <include name="tools/bin/*"/>
-          <not>
-                <filename name="bin/*.in.sh" />
-          </not>
+          <exclude name="bin/*.in.sh" />
+          <exclude name="tools/bin/*.in.sh" />
         </tarfileset>
       </tar>
 
@@ -1115,6 +1115,7 @@
           <exclude name="conf/hotspot_compiler" />
           <exclude name="doc/cql3/CQL.html" />
           <exclude name="bin/*" /> <!-- handled separately below -->
+          <exclude name="tools/bin/*" /> <!-- handled separately below -->
           <!-- exclude Eclipse files -->
           <exclude name=".project" />
           <exclude name=".classpath" />
@@ -1122,16 +1123,21 @@
           <exclude name=".externalToolBuilders/**" />
         </tarfileset>
 
-        <!-- Shell includes and batch files in bin/ -->
+        <!-- Shell includes and batch files in bin/ and tools/bin/ -->
         <tarfileset dir="${basedir}" prefix="${final.name}-src">
           <include name="bin/*.in.sh" />
           <include name="bin/*.bat" />
+          <include name="tools/bin/*.in.sh" />
+          <include name="tools/bin/*.bat" />
         </tarfileset>
         <!-- Everything else (assumed to be scripts), is executable -->
         <tarfileset dir="${basedir}" prefix="${final.name}-src" mode="755">
           <include name="bin/*"/>
           <exclude name="bin/*.in.sh" />
           <exclude name="bin/*.bat" />
+          <include name="tools/bin/*"/>
+          <exclude name="tools/bin/*.in.sh" />
+          <exclude name="tools/bin/*.bat" />
         </tarfileset>
       </tar>