Merge branch '2015.8' into '2016.3'

No conflicts.
This commit is contained in:
rallytime 2016-09-23 15:06:28 -06:00
commit 861a001749

View file

@ -36,7 +36,7 @@ class RabbitUserTestCase(integration.ModuleCase,
'rabbitmq_user.present', name='null_name', test=True
)
self.assertSaltFalseReturn(ret)
self.assertInSaltComment('User null_name is set to be created', ret)
self.assertInSaltComment('User \'null_name\' is set to be created', ret)
def absent(self):
'''