Merge branch 'master' into orm
authorEmmanuel Garette <egarette@cadoles.com>
Sun, 13 Apr 2014 08:30:42 +0000 (10:30 +0200)
committerEmmanuel Garette <egarette@cadoles.com>
Sun, 13 Apr 2014 08:30:42 +0000 (10:30 +0200)
commit5d8b5719a08039b6df2d73b91a001a7a9ebd454e
tree59967e2c982ab7789cd7956829864e2b6377f309
parent299e51e806ba98929670b93d716bc8c185b9996d
parentaa0734591d171bd166a526ba9e2969f2a958a216
Merge branch 'master' into orm

Conflicts:
test/test_config_api.py
tiramisu/autolib.py
tiramisu/config.py
tiramisu/option.py
tiramisu/value.py
17 files changed:
test/test_config.py
test/test_config_api.py
test/test_option_calculation.py
test/test_option_consistency.py
test/test_option_setting.py
test/test_option_validator.py
tiramisu/autolib.py
tiramisu/config.py
tiramisu/option/baseoption.py
tiramisu/option/masterslave.py
tiramisu/option/option.py
tiramisu/option/optiondescription.py
tiramisu/setting.py
tiramisu/storage/__init__.py
tiramisu/storage/dictionary/__init__.py
tiramisu/storage/util.py
tiramisu/value.py