Age | Commit message (Collapse) | Author | |
---|---|---|---|
2013-02-15 | do not be so hysteric when net fails | kali | |
2013-02-13 | disable some more ping tests | Micah Anderson | |
2013-02-14 | skip test that blocks build | kali | |
2013-02-07 | delete jsonschema inclusion workaround | kali | |
2013-02-01 | change log severity for not found config files | kali | |
2013-01-31 | pep8 | kali | |
2013-01-31 | hide jsonschema exception in tests | kali | |
2013-01-31 | fix jsonschema file | kali | |
2013-01-31 | add jsonschema 0.8 as a workaround for old ver | kali | |
2013-01-31 | avoid pep8 from choking | kali | |
2013-01-31 | pep8 | kali | |
2013-01-31 | add underscore to the $HOME pattern exception | kali | |
2013-01-31 | actually merge the release/v0.2.0 branch! | kali | |
My life has been a lie until this moment... I had done: git merge -s ours release/v0.2.0 to avoid deleting the debian folder... but that left the src untouched... Now I just rm'd the src folder and did a git checkout release/v0.2.0 src/ ... and merge happy! :) |