default native proto to correct port in Config
Merge branch 'cassandra-1.2' into trunk
GPFS loads dc/rack info from saved state if needed.
Patch by brandonwilliams, reviewed by vijay for CASSANDRA-5133
Merge branch 'cassandra-1.2' into trunk
cleanup
Merge branch 'cassandra-1.2' into trunk
Fix bogus sharing of SliceQueryFilter when using superColumn

patch by slebresne; reviewed by jbellis for CASSANDRA-5123
Coverage analysis for low CL queries

patch by slebresne; reviewed by jbellis for CASSANDRA-4858
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	src/java/org/apache/cassandra/service/StorageProxy.java
GPFS returns a default rack/dc as a last resort.
Patch by brandonwilliams reviewed by vijay for CASSANDRA-5133
Merge branch 'cassandra-1.2' into trunk
remove no-op notifyFailureDetector from GDSVH

See discussion at http://mail-archives.apache.org/mod_mbox/cassandra-dev/201301.mbox/%3CCABT57mYXOqSU2Md4xKiv9c5P7d5-PuBJFUkQtKvKY0EkuvCmbw@mail.gmail.com%3E
remove no-op notifyFailureDetector from GDSVH

See discussion at http://mail-archives.apache.org/mod_mbox/cassandra-dev/201301.mbox/%3CCABT57mYXOqSU2Md4xKiv9c5P7d5-PuBJFUkQtKvKY0EkuvCmbw@mail.gmail.com%3E
Trim dc/rack names in [G]PFS
Patch by Alexey Zotov, reviewed by brandonwilliams for CASSANDRA-5165
Merge branch 'cassandra-1.2' into trunk
convert default marshallers list to map for better readability
patch by dbrosius reviewed by bwilliams for CASSANDRA-5109
update changes.txt for 5109
Merge branch 'cassandra-1.1 into cassandra-1.2
Merge branch 'cassandra-1.2' into trunk
remove merge markers