modified setup script for virtual machines enviroment
update setupmachine param number hardcoded
see previous commit
empty param line removed
working version
substitute os.uname()[1] with socket.getfqdn()
fixed the hostname for the es cluster configuration
return to os.uname for now (the fqdn sould be tested better)
Merge pull request #28 from smorovic/master

More 1.3.3 updates
Merge branch 'master' of ssh://github.com/cmsdaq/hltd
fixing fillresources.py script for production
create dbtestsetup to configure the mysql tables for the hltd stuff in the openstack enviroment
fixes
Merge branch 'testdb' of ssh://github.com/zazasa/hltd into tmerge

Conflicts:
	python/setupmachine.py
fix
fix
survive symlink if jsd file is not present
adding number of framework streams
restart of hltd on BU won't interrupt FU runs
Merge branch 'master' into openstack-db