Rudder

2013-06-14

16:48 User story #3254 (In progress): Split Techniques "RUG / YaST package manager configuration (ZMD)" and "Zypper package manager configuration" in three: two for configuring Rug /YaST and Zypper and one for repositories management

I'm reworking on it. Nicolas PERRON

10:54 Revision 979f9e68 (rudder): Merge branch 'branches/rudder/2.6'

Vincent MEMBRÉ

10:54 Revision 625d55a7 (rudder): Merge branch 'branches/rudder/2.6'

Vincent MEMBRÉ

10:52 Revision 458a2dfc (rudder): Merge branch 'branches/rudder/2.5' into branches/rudder/2.6

Conflicts:
rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayNode.scala Vincent MEMBRÉ

10:52 Revision 3e193746 (rudder): Merge branch 'branches/rudder/2.5' into branches/rudder/2.6

Conflicts:
rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayNode.scala Vincent MEMBRÉ

10:34 Revision 17b2bdb5 (rudder): Merge branch 'branches/rudder/2.4' into branches/rudder/2.5

Conflicts:
rudder-core/src/main/scala/com/normation/rudder/batch/UpdateDynamicGroups.scala
rudder-core/src/main/sca... Vincent MEMBRÉ

10:34 Revision e6d238da (rudder): Merge branch 'branches/rudder/2.4' into branches/rudder/2.5

Conflicts:
rudder-core/src/main/scala/com/normation/rudder/batch/UpdateDynamicGroups.scala
rudder-core/src/main/sca... Vincent MEMBRÉ