diff options
| author | Joshua Harlow <harlowja@yahoo-inc.com> | 2014-11-25 11:46:10 -0800 |
|---|---|---|
| committer | Joshua Harlow <harlowja@yahoo-inc.com> | 2014-11-25 11:46:10 -0800 |
| commit | 7b39b3976f94fd9ce9cbe39324ec14ad5a7c334e (patch) | |
| tree | 0ebb51599a0024b2507811697bfe965e66ac29e1 /test-requirements.txt | |
| parent | 7d20f3843bff0069b1ac9b2f0c6d346889789058 (diff) | |
| parent | 1db41a6f5283d38dff6de0b0421d51eac869a39c (diff) | |
| download | vyos-cloud-init-7b39b3976f94fd9ce9cbe39324ec14ad5a7c334e.tar.gz vyos-cloud-init-7b39b3976f94fd9ce9cbe39324ec14ad5a7c334e.zip | |
Update with trunk and resolve conflicts
Diffstat (limited to 'test-requirements.txt')
| -rw-r--r-- | test-requirements.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test-requirements.txt b/test-requirements.txt index 2edb8066..230f0404 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,4 +1,5 @@ httpretty>=0.7.1 +mock mocker nose pep8==1.5.7 |