Allow log4j-server.properties to be a symlink.
Patch by brandonwilliams, reviewed by iamaleksey for CASSANDRA-6170
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	src/java/org/apache/cassandra/service/CassandraDaemon.java
Versions and license for 1.2.11 release
Add ability to list specific KS/CF combinations in nodetool cfstats
Patch by Lyuben Todorov, reviewed by brandonwilliams for CASSANDRA-4191
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	build.xml
	debian/changelog
Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/tools/NodeCmd.java
Merge branch 'cassandra-2.0' into trunk
Mark CF clean if a mutation raced the drop and got it marked dirty
patch by jbellis; reviewed by Tyler Hobbs for CASSANDRA-5946
merge from 1.2
Merge branch 'cassandra-2.0' into trunk
Fix nodetool status regression
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
Remove new asserts in CMFD
Patch by Sam Tunnicliffe, reviewed by brandonwilliams for CASSANDRA-6208
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
implementing CL.LOCAL_ONE
Merge branch '6202' into 6202_2.0