Qubes/core-admin
1
0
Vork 0
Code Kwesties Pull-aanvragen Publicaties Wiki Activiteit
3.545 Commits 1 Branch 0 Labels 20 MiB
12f778b539
Commit grafiek

2 Commits

Auteur SHA1 Bericht Datum
Wojtek Porczyk
9eafa57539 Merge remote-tracking branch 'marmarek/master' into core3-devel 
The following list is bollocks. There were many, many more.

Conflicts:
    core-modules/003QubesTemplateVm.py
    core-modules/005QubesNetVm.py
    core/qubes.py
    core/storage/__init__.py
    core/storage/xen.py
    doc/qvm-tools/qvm-pci.rst
    doc/qvm-tools/qvm-prefs.rst
    qubes/tools/qmemmand.py
    qvm-tools/qvm-create
    qvm-tools/qvm-prefs
    qvm-tools/qvm-start
    tests/__init__.py
    vm-config/xen-vm-template-hvm.xml

This commit took 2 days (26-27.01.2016) and put our friendship to test.
    --Wojtek and Marek
 2016-03-03 01:13:51 +01:00
Wojtek Porczyk
c538d536c8 core3: move qmemman 
This is part of fixing qvm-start.

qmemman was moved with minimal touching, mainly module names.

Moved function parsing human-readable sizes from core2. This function is
wrong, because it treats k/M/G as 1024-based, but leave it for now.
 2015-10-05 12:46:14 +02:00