Commit Graph

8 Commits

Author SHA1 Message Date
Michael Hobbs
3e58824377 Merge branch 'master' into kilianc_hotfix-#1259 2015-07-12 16:27:10 -07:00
Michael Hobbs
ee4fca572e mv dockerfile port logic to common function + tests. closes #1280 2015-07-12 15:57:12 -07:00
Michael Hobbs
033a267573 fix urls command when NO_VHOST=1 + tests. fixes #1294 2015-07-09 12:12:58 -07:00
Michael Hobbs
4aedb6507a Merge branch 'master' into mh-ps-scale 2015-04-30 10:32:29 -07:00
Michael Hobbs
2f0f2889db need to restart now 2015-04-24 15:41:32 -07:00
Michael Hobbs
a18fa7afbe we only need the first container here 2015-04-24 11:30:20 -07:00
Michael Hobbs
99d2601f2f fix tests 2015-04-21 14:32:30 -07:00
Michael Hobbs
4e472c39e3 uniform unit test labels 2015-04-01 17:44:34 -07:00