Merge branch 'geni-v3' into dbsession
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 14 Nov 2013 07:31:26 +0000 (08:31 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 14 Nov 2013 07:31:26 +0000 (08:31 +0100)
commitb54e90d0c3868fa5afb89ff784cba0d5d36265ad
treebc2914aa50adbd82746c8fe6e84d6fc8718f1440
parentc9e4b78c8145106fd2482e244ea857e51930ba56
parent97dae512edca86d6f4ff892a64383d934abe7aa0
Merge branch 'geni-v3' into dbsession
dbsession at this point is almost in sync with geni-v3, let's integrate tehe rest of the deltas
sfa/importer/plimporter.py
sfa/planetlab/plaggregate.py
sfa/planetlab/pldriver.py
sfa/planetlab/plslices.py