diff options
| author | Jarl Stefansson <jarl@sdelements.com> | 2013-12-13 15:51:45 -0500 |
|---|---|---|
| committer | Jarl Stefansson <jarl@sdelements.com> | 2013-12-13 15:51:45 -0500 |
| commit | 6c6d58a0f3f286ae7994cc54c05416c7efd6b87a (patch) | |
| tree | 195a672b6a550b7735c81db9b1db5d72c88c1f1d /tests/virtualenv.pp | |
| parent | f7801a4b0d9ae58187891d124c21d269eae19ba5 (diff) | |
| parent | 44ea60543b37ce5ddb9ff9b7411dbf7a0330f0e6 (diff) | |
Merge branch 'master' of github.com:jalli/puppet-python
Conflicts:
manifests/pip.pp
manifests/requirements.pp
manifests/virtualenv.pp
Diffstat (limited to 'tests/virtualenv.pp')
0 files changed, 0 insertions, 0 deletions