Commit Graph
5 Commits
Author SHA1 Message Date
Wayne Witzel III d4232eaca0 Merge pull request #534 from cchurch/django18
Django 1.8 and DRF 3.3 Support
2016-02-04 14:28:44 -05:00
Wayne Witzel III 5a6dd266da Merge pull request #784 from wwitzel3/issue/616
fixing inventory bug for GCE introduced fixing #616
2016-02-03 16:04:11 -05:00
Wayne Witzel III cd13083ea2 Merge pull request #720 from wwitzel3/issue/616
Set GCE_ZONE source_regions
2016-02-02 10:21:37 -05:00
Wayne Witzel III 3982f34392 Merge pull request #764 from wwitzel3/docker-refresh
add a docker-refresh make target
2016-02-02 09:39:56 -05:00
Wayne Witzel III 4149fda081 Merge pull request #747 from wwitzel3/tests-squash
Use py.test for collecting and running tests.
2016-02-02 09:39:04 -05:00