commit 96fc798956acc56a0136d46197c4027118f83aea
Merge: 98da4d0 b3aa93a
Author: Klaus Aehlig <[email protected]>
Date: Mon May 26 17:14:38 2014 +0200
Merge branch 'stable-2.10' into stable-2.11
* stable-2.10
Use more efficient statistics for the standard deviation
Use statistics updates when allocating on pairs
Factor score computation through abstract statistics
Verify the update of the standard deviation statistics
Add data type for abstract statistics
Relax test requirements
Fix gnt-network client wrt instances report
Fix QueryNetworks wrt instances
Conflicts:
lib/cmdlib/network.py
Resolved by ignoring the change as the corresponding code
has been removed in 2.11.
--
Klaus Aehlig
Google Germany GmbH, Dienerstr. 12, 80331 Muenchen
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores
