Steven Armstrong
|
8ac375e8a6
|
Merge branch 'master' into autorequire
Conflicts:
lib/cdist/test/emulator/__init__.py
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
|
2011-11-17 13:08:30 +01:00 |
|
Steven Armstrong
|
56d783f612
|
tests and fixtures for type parameters with dashes
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
|
2011-11-17 13:03:56 +01:00 |
|
Steven Armstrong
|
0d05e61b85
|
tests and fixtures for emulator autorequire
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
|
2011-11-02 23:57:13 +01:00 |
|