Gene Wood b540e28aef Merge branch 'master' into reinforce2019 ... # Conflicts: # README.md # cloudy_mozdef/cloudformation/mozdef-alert-developer.yml # docker/compose/mozdef_bootstrap/files/index_mappings/alerts-star.json		2019-07-10 10:38:04 -07:00
..
builder	Work around permission issue with writing to /.aws	2018-11-01 13:01:13 -07:00
compose	Merge branch 'master' into reinforce2019	2019-07-10 10:38:04 -07:00