Merge branch 'devel-2.1'
* devel-2.1: (22 commits) NEWS: fix empty lines Fix a unittest name and docstring Force ssh to allocate a tty Fix a unittest docstring IsProcessAlive: retry stat() a few times Retry{Again,Timeout}: explain reraising utils.Retry: pass up timeout arguments Add a few Retry unittests Bump version for 2.1.2.1 release Update NEWS for Ganeti 2.1.2.1 KVM: only export instance tags if present ssh.GetUserFiles: move to EnsureDirs Hypervisors: use utils.EnsureDirs backend: remove a couple of useless mkdir calls daemon.GenericMain: fix docstring jstore: use EnsureDirs, and add more constants Bump version for 2.1.2 release Update NEWS file for 2.1.2 Add dates to the NEWS file RAPI QA: Test instance creation/removal via RAPI ... Conflicts: NEWS - trivial (merge NEWS entries) lib/backend.py - trivial (master doesn't have the changed code) lib/constants.py - trivial (merge constants, plus one s/0700/SECURE_DIR_MODE/) test/ganeti.utils_unittest.py - trivial (name+docstring changes) Signed-off-by:Guido Trotter <ultrotter@google.com> Reviewed-by:
Iustin Pop <iustin@google.com>
No related branches found
No related tags found
Showing
- NEWS 157 additions, 0 deletionsNEWS
- configure.ac 2 additions, 2 deletionsconfigure.ac
- lib/constants.py 5 additions, 2 deletionslib/constants.py
- lib/daemon.py 3 additions, 2 deletionslib/daemon.py
- lib/hypervisor/hv_chroot.py 1 addition, 5 deletionslib/hypervisor/hv_chroot.py
- lib/hypervisor/hv_fake.py 1 addition, 2 deletionslib/hypervisor/hv_fake.py
- lib/hypervisor/hv_kvm.py 2 additions, 1 deletionlib/hypervisor/hv_kvm.py
- lib/jstore.py 2 additions, 8 deletionslib/jstore.py
- lib/rapi/client.py 29 additions, 51 deletionslib/rapi/client.py
- lib/ssh.py 3 additions, 8 deletionslib/ssh.py
- lib/utils.py 36 additions, 9 deletionslib/utils.py
- qa/ganeti-qa.py 6 additions, 0 deletionsqa/ganeti-qa.py
- qa/qa_rapi.py 121 additions, 38 deletionsqa/qa_rapi.py
- test/ganeti.rapi.client_unittest.py 1 addition, 9 deletionstest/ganeti.rapi.client_unittest.py
- test/ganeti.utils_unittest.py 61 additions, 1 deletiontest/ganeti.utils_unittest.py
Loading
Please register or sign in to comment