Ref #3256 : Remove trailling spaces
Merge pull request #14 from VinceMacBuche/ust_3256/remove_trailling_space

Ref #3256 : Remove trailling spaces
Ref #3250 Fixes #3252: split RO/RW ldap connection, but not repos on top of it
Merge pull request #13 from fanf/bug_3211/dev/transactionnal_behavior_on_config

Ref #3250 Fixes #3252: split RO/RW ldap connection, but not repos on top of it
Ref #3310 : Add support for Solaris OS in inventory
Merge pull request #15 from VinceMacBuche/ust_3309/dev_3310/Solaris_Support

Ref #3309 : Add support for Solaris OS in inventory
Merge branch 'branches/rudder/2.5'

* branches/rudder/2.5:
  Ref #3310 : Add support for Solaris OS in inventory

Conflicts:
	inventory-api/src/main/scala/com/normation/inventory/domain/NodeInventory.scala
	inventory-fusion/src/main/scala/com/normation/inventory/provisioning/fusion/FusionReportUnmarshaller.scala
	inventory-repository/src/main/scala/com/normation/inventory/ldap/core/InventoryDit.scala
	inventory-repository/src/main/scala/com/normation/inventory/ldap/core/InventoryMapper.scala
	inventory-repository/src/main/scala/com/normation/inventory/ldap/core/LDAPConstants.scala
Change version of pom.xml to 2.6.0~alpha0
Change version of pom.xml to 2.6.0~alpha1-SNAPSHOT
Change version of pom.xml to 2.6.0~alpha2-SNAPSHOT
Change version of pom.xml to 2.6.0~alpha3-SNAPSHOT
Change version of pom.xml to 2.6.0~alpha4-SNAPSHOT
Change version of pom.xml to 2.6.0~alpha5-SNAPSHOT
Ref #3382 : When Machine Inventory moved from Pending,  change the node Inventory container change too
Merge pull request #16 from VinceMacBuche/bug_3382/Machine_Inventory_on_rudder_installation

Ref #3382 : When Machine Inventory moved from Pending,  change the node ...
Change version of pom.xml to 2.6.0~alpha6-SNAPSHOT
Change version of pom.xml to 2.4.5-SNAPSHOT
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5

Conflicts:
	inventory-api/pom.xml
	inventory-fusion/pom.xml
	inventory-provisioning-core/pom.xml
	inventory-provisioning-web/pom.xml
	inventory-repository/pom.xml
	pom.xml
Merge branch 'branches/rudder/2.5'
Change version of pom.xml to 2.5.2-SNAPSHOT