An error occurred while retrieving approval data for this merge request.
3 unresolved threads
Second iteration after changes in the dsm-api from ds485-stack/dsm-api!51 (merged). It is based on code from !520 (merged) so only the last commit should be taken into account during review.
Activity
Build Started: http://dsjenkins.cloudapp.net/jenkins/job/dSS_MR/631/
Build finished. Tests FAILED. Build results available at: http://dsjenkins.cloudapp.net/jenkins/job/dSS_MR/631/
mentioned in merge request !523 (closed)
added 34 commits
-
c8e7b15c...88760847 - 31 commits from branch
dss:master
- 59504561 - Adapted to dsm-api version 3.3.0
- e71a90a1 - Changed the StateMachine in the BusInterface layer to Application
- e45d5183 - Updated to new version of dsm-api
Toggle commit list-
c8e7b15c...88760847 - 31 commits from branch
mentioned in merge request ds485-stack/dsm-api!51 (merged)
Build Started: http://dsjenkins.cloudapp.net/jenkins/job/dSS_MR/642/
Build finished. Tests FAILED. Build results available at: http://dsjenkins.cloudapp.net/jenkins/job/dSS_MR/642/
655 655 656 if (isZoneUserGroup(_group->getID()) || isGlobalAppUserGroup(_group->getID())) { 656 if (isValidGroup(_group->getID())){ 657 657 _group->setApplicationType(applicationType); 658 m_Interface.groupSetStateMachine(_group->getZoneID(), _group->getID(), applicationType); 659 return; 660 } 661 662 throw DSSException("SetStandardColor group: id " + intToString(_group->getID()) + " too large"); 663 } // groupSetStandardID 664 665 void StructureManipulator::groupSetApplicationConfiguration(boost::shared_ptr<Group> _group, const int applicationConfiguration) { 666 667 // we allow to set the configuration in all groups for now 668 if (isValidGroup(_group->getID())) { 669 658 _group->setApplicationConfiguration(applicationConfiguration); mentioned in commit 869d4769