projects / ganeti-local / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c55cc34 a0a63e7)
Merge remote-tracking branch 'origin/devel-2.5'
authorIustin Pop <iustin@google.com>
Mon, 5 Mar 2012 21:48:16 +0000 (23:48 +0200)
committerIustin Pop <iustin@google.com>
Tue, 6 Mar 2012 18:58:14 +0000 (20:58 +0200)
commit7bfb336771c1b7be4572940a855dccc26e08d8e2
tree7450ff50c2cf2d70f9db46dc9ecabb4e2944f32ctree | snapshot
parentc55cc3463f5bad658a2b6b63355a13c1cb67f88dcommit | diff
parenta0a63e7690b9124f966e87d7f5fc896cf6b9af17commit | diff
Merge remote-tracking branch 'origin/devel-2.5'

Conflicts:
        Makefile.am    (trivial, test data files added on both branches)
        lib/opcodes.py (trivial, master renamed filter→qfilter, 2.5
                        fixed the type of the parameter)

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: René Nussbaumer <rn@google.com>
Makefile.am diff1 | diff2 | blob | history
lib/client/gnt_node.py diff1 | diff2 | blob | history
lib/cmdlib.py diff1 | diff2 | blob | history
lib/opcodes.py diff1 | diff2 | blob | history
man/gnt-node.rst diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.