Fix build
Merge commit '4b6d6ebd8cb613d1975ef3fc6e7ba4218143364c' into cassandra-2.1.0
ninja add benedict to committers
Merge branch 'cassandra-2.1' into trunk
fix build
Merge branch 'cassandra-2.1' into trunk
remove dead method
Merge branch 'cassandra-2.1' into trunk
Fix UDT field selection with empty field

patch by mstepura; reviewed by slebresne for CASSANDRA-7670
Fix build
Fix UDT field selection with empty field

patch by mstepura; reviewed by slebresne for CASSANDRA-7670
Merge branch 'cassandra-2.1' into trunk
Prevent SSP from erroring out when the yaml is yanked from it.

Patch by brandonwilliams, reviewed by Richard Low for CASSANDRA-7663
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/locator/SimpleSeedProvider.java
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Prevent SSP from erroring out when the yaml is yanked from it.

Patch by brandonwilliams, reviewed by Richard Low for CASSANDRA-7663
Merge branch 'cassandra-2.1' into trunk
fix build, remove dead method again
Merge branch 'cassandra-2.1' into trunk