Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

diff --cc src/surf/storage_n11.cpp
index 53b7503,6a709c7..6d71df7
--- 1/src/surf/storage_n11.cpp
--- 2/src/surf/storage_n11.cpp
+++ b/src/surf/storage_n11.cpp
@@@ -17,9 -17,9 +17,9 @@@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_
   *************/
  extern std::map<std::string, simgrid::surf::StorageType*> storage_types;
  
 -static void check_disk_attachment()
 +void check_disk_attachment()
  {
-   for (auto const& s : simgrid::s4u::Engine::getInstance()->getAllStorages()) {
+   for (auto const& s : simgrid::s4u::Engine::getInstance()->get_all_storages()) {
      simgrid::kernel::routing::NetPoint* host_elm = sg_netpoint_by_name_or_null(s->getImpl()->getHost().c_str());
      if (not host_elm)
        surf_parse_error(std::string("Unable to attach storage ") + s->get_cname() + ": host " +