Age | Commit message (Collapse) | Author | |
---|---|---|---|
2012-08-24 | Merge branch 'get-definition.json' into providers-static | kali | |
adjusted some loose ends to make tests pass again. this merge is still half-baked regarding functionality: I've left in place old Configuration class used by some tests antialias did on his branch. I plan to merge that functionality with the more recent JSONConfig and Spec classes. Conflicts: src/leap/base/configuration.py src/leap/eip/config.py src/leap/eip/tests/test_config.py |