Skip to content

Commit

Permalink
Merge pull request #491 from roots/ansible-role-composer
Browse files Browse the repository at this point in the history
Use ansible-role-composer
  • Loading branch information
retlehs committed Feb 17, 2016
2 parents 18fa708 + 0139646 commit aa29154
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 15 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
### HEAD
* Use ansible-role-composer ([#491](https://github.com/roots/trellis/pull/491))
* Fix bad `curl` output ([#490](https://github.com/roots/trellis/pull/490))
* Fixes #410 - Default to 1 CPU in Vagrant ([#487](https://github.com/roots/trellis/pull/487))

Expand Down
4 changes: 4 additions & 0 deletions requirements.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
- name: composer
src: geerlingguy.composer
version: 1.2.7

- name: ntp
src: resmo.ntp
version: 0.3.0
Expand Down
15 changes: 0 additions & 15 deletions roles/composer/tasks/main.yml

This file was deleted.

0 comments on commit aa29154

Please sign in to comment.