• Katerina Lorenzova's avatar
    Merge remote-tracking branch 'origin/upstream' · 954336b0
    Katerina Lorenzova authored
    Conflicts:
            boardfarm_config_example.json
                    -> our config is in new boardfarm_config_praha.json file
            devices/board_decider.py
    		-> file deprecated
    		-> board types moved to board classes
            devices/power.py
    		-> our support for old reboot hw hack is deprecated
            tests/linux_boot.py
    		-> keeping our linux_boot.py which is more robust
            testsuites.cfg
    		-> our testsuites moved to testsuites_praha.cfg
    954336b0