Merge with trunk, including fixing up conflicts with the removal of fake_users
and the reworking of node.py -> service.py.
This commit is contained in:
		@@ -24,5 +24,4 @@ FLAGS.connection_type = 'libvirt'
 | 
			
		||||
FLAGS.fake_storage = False
 | 
			
		||||
FLAGS.fake_rabbit = False
 | 
			
		||||
FLAGS.fake_network = False
 | 
			
		||||
FLAGS.fake_users = False
 | 
			
		||||
FLAGS.verbose = False
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user