DESCRIPTION

separate failover tests for non-cluster_run nodes

Since failover tests cannot be run by cluster-run
environments, put into separate conf file.
Also renaming viewmerge to viewquery


COMMENTS

author: Reid Stokes
date: 2012-02-07 19:19:06.941000000

Patch Set 1: Looks good to me, approved

Change the jenkins job as well with these conf files.

-------------------------------------
author: Titus Ho
date: 2012-02-07 19:23:16.538000000

Patch Set 1: Verified

Jenkins updated as well

-------------------------------------
author: Titus Ho
date: 2012-02-07 19:23:16.876000000

Change has been successfully cherry-picked as 7646501473728ec6d9b1b388025e8ddc4770b8d6.

-------------------------------------
