Fix log detection post-5187
Try to make stress binary executable if it's not
Merge pull request #60 from thobbs/stress-executable

Try to make stress binary executable if it's not
Added support for the ccm updatelog4jconf, feature allows to update Cassandra log4j configuration file (log4j-server.properties). See, JIRA for details, https://issues.apache.org/jira/browse/CASSANDRA-5322
Ensure thrift is ready on cluster start
Merge branch 'master' of https://github.com/pcmanus/ccm
Merge pull request #61 from driftx/master

Fix race between cassandra startup and thrift being ready
CASSANDRA-5322: Implemented ccm setlog with java class name and log level clister wide or per node, implemented (updated last implementation) ccm updatelog4j configuration file, cluster wide or per node
CR change: changed ''.join to os.path.join
CASSANDRA-5322: made changes to follow CR down by Sylvain Lebresne
Merge pull request #62 from azarutin/advances_logging

Advances logging
trivial change to add nodetool version to command list.
found this helpful to satisfy my paranoia when testing out upgrade scenarios.
Merge pull request #63 from jasobrown/master

trivial change to add nodetool version to command list
Allow multiple per-class logger settings
Fixes new/updated branch and tag fetching from remote repository.

Fetches branches and tags now in one step using a single refspec.
Removes the need to update the local branch manually.
Merge pull request #65 from EnigmaCurry/git-cache-fixes

Fixes new/updated branch and tag fetching from remote repository.
Fix up/down message detection
Merge branch 'master' of https://github.com/pcmanus/ccm
Merge pull request #68 from driftx/master

Update up/down detection
Merge branch 'master' of github.com:pcmanus/ccm

Conflicts:
	ccmlib/node.py