Set MALLOC_ARENA_MAX when unset.
Patch by brandonwilliams for CASSANDRA-6126
Set MALLOC_ARENA_MAX when unset.
Patch by brandonwilliams for CASSANDRA-6126
fix missing then
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	conf/cassandra-env.sh
Update the pig examples to include more recent pig/cassandra features.
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-4549
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk