From: couturie Date: Sun, 30 Jan 2011 13:37:03 +0000 (+0100) Subject: Merge branch 'master' of ssh://info.iut-bm.univ-fcomte.fr/loba X-Git-Tag: v0.1~188 X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/commitdiff_plain/4e922bca67d7cf4bc30a878cd7cd46d39fbe1573?hp=9a61d03554f90cad51c1e367f20cbf64f90bd75a Merge branch 'master' of ssh://info.iut-bm.univ-fcomte.fr/loba Conflicts: loba_fairstrategy.cpp --- diff --git a/loba_fairstrategy.cpp b/loba_fairstrategy.cpp index 4ad0bff..7e02a21 100644 --- a/loba_fairstrategy.cpp +++ b/loba_fairstrategy.cpp @@ -21,7 +21,8 @@ void loba_fairstrategy::load_balance() { std::sort(pneigh.begin(), pneigh.end(), compare()); - print_loads_p(false, xbt_log_priority_debug); + // print_loads_p(); + //print_loads_p(false, xbt_log_priority_debug); bool found = true;