Statistics
| Branch: | Tag: | Revision:

root @ 6873e6b7

# Date Author Comment
6873e6b7 07/23/2013 04:08 pm Dimitris Aragiorgis

Bump new upstream version

Signed-off-by: Dimitris Aragiorgis <>

73f5b6db 07/23/2013 04:07 pm Dimitris Aragiorgis

Merge branch 'stable-2.6-ippool-hotplug-esi-nolvm-netxen' into debian-2.6

22ddf068 06/19/2013 10:34 pm Dimitris Aragiorgis

Fix vif-ganeti link

Signed-off-by: Dimitris Aragiorgis <>

6051fd94 06/19/2013 08:54 pm Dimitris Aragiorgis

Take Makefile and configure magic from master

Add SHELL_ENV_INIT and XEN_CONFIG_DIR

Signed-off-by: Dimitris Aragiorgis <>

1088a02a 06/19/2013 05:47 pm Dimitris Aragiorgis

Refactor NIC configuration scripts

Add new script vif-ganeti that could be used instead of
default vif-bridge in order NIC customization can be more
flexible.

Extract common code from kvm-ifup and insert it in a new
file net-common that is being sourced by kvm-ifup and...

c07f38e1 06/17/2013 02:00 pm Dimitris Aragiorgis

Make NIC setup more flexible in case of Xen

For every NIC write down a file that contains NIC's
info (MAC, mode, link, network details), that can
be sourced by any vif script. The file location is:
/var/run/ganeti/xen-hypervisor/nic/<domname>/<nicidx>.
...

6ece11be 02/20/2013 06:13 pm Dimitris Aragiorgis

Fix --no-lvm-support

Return -1 and not None for vg_size and vg_free and make
volume_group_name optional in cluster config object in Haskell.

Signed-off-by: Dimitris Aragiorgis <>

2568b6ba 01/14/2013 01:51 pm Dimitris Aragiorgis

Bump new version

Signed-off-by: Dimitris Aragiorgis <>

c1b5a3ac 01/14/2013 01:49 pm Dimitris Aragiorgis

Merge branch 'stable-2.6-ippool-hotplug-esi' into debian-2.6

c9ff267c 01/14/2013 01:34 pm Dimitris Aragiorgis

Add KVM machine version as hv param

This is needed in case an instance must be booted with an exact type of
machine version (due to e.g. outdated drivers). If this hv param
explicitly defined (during instance creation/modification) then the kvm
process will be started having this version for the -M option. Otherwise...

74cbd3bd 01/11/2013 03:51 pm Dimitris Aragiorgis

Merge branch 'stable-2.6-ippool-hotplug-esi' into debian-2.6

5e8807cc 01/11/2013 03:47 pm Constantinos Venetsanopoulos

Merge remote branch 'google/stable-2.6' into stable-2.6-ippool-hotplug-esi

63b883de 01/09/2013 05:57 pm Michael Hanselmann

Add utility to format dictionary as key=value strings

This will be used in QA to format network interface parameters.

This is a cherry-pick of master commit eac9b7b8

Signed-off-by: Michael Hanselmann <>
Reviewed-by: Guido Trotter <>

c12e30ca 01/09/2013 05:21 pm Guido Trotter

Remove fixed FIXME

This was fixed in stable-2.6, commit 053c356

Signed-off-by: Guido Trotter <>
Reviewed-by: Iustin Pop <>

558e2e8a 01/09/2013 05:20 pm Michael Hanselmann

QA: Support master-netdev and default NIC parameters

Requested in issue 337.

The parameter “bridge” was not documented and is therefore silently
replaced with “master-netdev”. A note is added to “qa-sample.json”
describing how comments work.

This is a cherry-pick of master commit...

cbf5114e 01/09/2013 05:20 pm Michael Hanselmann

QA: Do not pass "--bridge" to "gnt-cluster init"

Commit ec0652a (June 2009) removed the option.

This is a cherry-pick of master commit
784537390cd5b1c4f5f8fb9401a62eb23acce39b

Signed-off-by: Michael Hanselmann <>
Reviewed-by: Iustin Pop <>

fdbc5d2f 01/08/2013 07:08 pm Dimitris Aragiorgis

Add machine version in kvm runtime file

kvm -M ? returns the supported machines (e.g. pc-1.1).
Add _GetDefaultMachineVersion() function to get the default value.

Upon kvm runtime file creation (this is in _GenerateKVMRuntime() invoked
only in StartInstance()) append this info in kvm_cmd. During...

8a2480d2 12/22/2012 05:04 pm Dimitris Aragiorgis

Bump new version

Signed-off-by: Dimitris Aragiorgis <>

d21c6340 12/22/2012 04:56 pm Dimitris Aragiorgis

Merge branch 'stable-2.6-ippool-hotplug-esi' into debian-2.6

6f2a81cd 12/22/2012 04:54 pm Dimitris Aragiorgis

Merge branch 'stable-2.6' into stable-2.6-ippool-hotplug-esi

efe2137a 12/20/2012 02:16 pm Iustin Pop

Final update of NEWS file for 2.6.2 and version bump

I'm already setting this to a release date of tomorrow, since QA on
the 2.6 branch has been clean.

Signed-off-by: Iustin Pop <>
Reviewed-by: Michael Hanselmann <>

e0f470ac 12/19/2012 03:52 pm Iustin Pop

Fix job completion with big job queues

Accidentally stumbled upon this while testing unrelated code on a
machine with ~3K active jobs - the bash completion unittest was
hanging.

Upon investigation, it turns out that bash's ${var//pattern/repl/} is
probably quadratic in the size of input (or worse, even):...

abee3636 12/14/2012 04:52 pm Iustin Pop

confd: reduce noise during normal config reload

During a normal configuration update, done via write to temp file and
rename, this is what confd logs (slightly edited for clarity):

2012-12-14 01:05:53: ganeti-confd INFO Loaded new config, serial 21866
2012-12-14 01:06:18: ganeti-confd INFO File lost, trying to re-establish notifier...

a3d1dc0a 12/14/2012 04:43 pm Iustin Pop

Change hbal handling of !auto_balance instances

Note: I'll add tests for this on the master branch, but not here.

Signed-off-by: Iustin Pop <>
Reviewed-by: Guido Trotter <>

75c7a686 12/14/2012 12:14 pm Bernardo Dal Seno

Small corrections in man pages

The only semantic change is the fix of the spelling of the option
--ipolicy-disk-templates.

Signed-off-by: Bernardo Dal Seno <>
Reviewed-by: Guido Trotter <>

6c282c89 12/13/2012 07:46 pm Iustin Pop

Fix gnt-instance(8) w.r.t. growable disk templates

This fixes Issue 257.

Signed-off-by: Iustin Pop <>
Reviewed-by: Helga Velroyen <>

80b207df 12/13/2012 05:36 pm Iustin Pop

Stop verifying opcode results in dry_run mode

Commit 1ce03fb1 (“Add ht-based result checks to opcodes”) introduced
infrastructure for checking opcode results, and subsequent commits
improved the list of opcodes which do declare a result, however this
was not tested for dry-run mode operation....

80df2895 12/12/2012 03:33 pm Michael Hanselmann

Update NEWS for 2.6.2

This is in preparation for a 2.6.2 release.

Signed-off-by: Michael Hanselmann <>
Reviewed-by: Iustin Pop <>

8e8092cc 12/12/2012 03:21 pm Michael Hanselmann

Fix TypeError when unsetting OS parameters

When all OS parameters should be unset (“gnt-os modify -H -xen-pvm
foo”), a TypeError was raised. This fixes issue 311.

Signed-off-by: Michael Hanselmann <>
Reviewed-by: Iustin Pop <>

13b8415b 12/10/2012 05:48 pm Dimitris Aragiorgis

Update changelog to latest version

Signed-off-by: Dimitris Aragiorgis <>

9da445a9 11/30/2012 10:46 pm Dimitris Aragiorgis

Merge branch 'stable-2.6-ippool-hotplug-esi' into debian-2.6

95a74ef3 11/30/2012 10:39 pm Dimitris Aragiorgis

Support newstyple rbd commangd output

This patch is taken from ganeti mailing list: http://goo.gl/LgukY

Signed-off-by: Dimitris Aragiorgis <>

d9039658 11/30/2012 10:12 pm Dimitris Aragiorgis

Fix a bug introduced by resolving a conflict

In _GenerateDiskTemplate() we make use of params variable in case
of ExtStorage. Hotplug code conflicts here.

Signed-off-by: Dimitris Aragiorgis <>

2ccfc35a 11/30/2012 07:24 pm Dimitris Aragiorgis

Merge branch 'stable-2.6-hotplug' into stable-2.6-ippool-hotplug-esi

7ed9f1ba 11/30/2012 07:24 pm Dimitris Aragiorgis

Fix a minor bug in hypervisor

Signed-off-by: Dimitris Aragiorgis <>

88e9b27f 11/27/2012 08:36 pm Dimitris Aragiorgis

Merge branch 'stable-2.6-hotplug' into stable-2.6-ippool-hotplug-esi

Conflicts:
lib/cmdlib.py
tools/cfgupgrade

Signed-off-by: Dimitris Aragiorgis <>

2435f63b 11/26/2012 12:49 pm Dimitris Aragiorgis

Refactor hotplug implementation

Remove pci_pool from hotplug_info. Hypervisor decides the pci slot
based on current occupations.

Signed-off-by: Dimitris Aragiorgis <>

12f647fb 11/22/2012 03:13 pm Guido Trotter

cmdlib.py: don't use GetHypervisor

In cmdlib we must only use the hypervisor class, and never instantiate
it. As such we have to call GetHypervisorClass instead, to avoid
getting an instance of it.

This fixes Issue 316, because init is not called from masterd...

70296981 11/19/2012 03:17 pm Iustin Pop

Fix opcode validation for OpOobCommand.command

The 'command' attribute of the OpOobCommand command is defined with a
default value of None, but its validation requires a member of
constants.OOB_COMMANDS, which doesn't accept None. This result in the
following error when submitting an opcode without the command:...

e98bb8c8 11/15/2012 09:31 am Michael Hanselmann

Fix typo in manpage for gnt-os

s/exists/exist/

Signed-off-by: Michael Hanselmann <>
Reviewed-by: Michele Tartara <>

1511a65d 11/14/2012 01:07 pm Dimitris Aragiorgis

Merge branch 'stable-2.6-ippool-hotplug-esi' into debian-2.6

c9fc98df 11/14/2012 01:05 pm Dimitris Aragiorgis

Remove unused code in cfgupgrade

Signed-off-by: Dimitris Aragiorgis <>

f5720846 11/14/2012 10:43 am Guido Trotter

gnt-instance.8: Add index to disk and nic removal

The text of the manpage explains that an index can be prepended to
"remove" but the short help doesn't mention it. Adding it helps making
the syntax clear.

Signed-off-by: Guido Trotter <>...

4041a4e3 11/12/2012 03:14 pm Iustin Pop

Improve error message when migration status fail

Commit 6a1434d7 (“Make migration RPC non-blocking”) changed the API
for reporting migration status, but has a small cosmetic bug: if the
migration status if failure, but the RPC itself to get the status
didn't fail, it shows the following error message:...

62457f51 11/12/2012 03:13 pm Iustin Pop

Fix type error in kvm/GetMigrationStatus

Commit 6a1434d7 (“Make migration RPC non-blocking”) changed from
raising HypervisorErrors to returning MigrationStatus
objects. However, these objects don't have an "info" attribute, so
they can't pass a reason back (which is in itself a bug); but the KVM...

a4c0fe1e 11/12/2012 01:29 pm Iustin Pop

Fix PID file writing in Haskell daemons

Currently, the code uses createFile, which has the effect of always
truncating the file. This is bad, as the content of the PID file is
wiped even when we wouldn't be able to lock it!

We switch to openFd (createFile is just a wrapper over that), and we...

e080072c 11/08/2012 03:53 pm Michael Hanselmann

http/__init__.py: Remove extraneous argument

pylint complained, I fixed it, and unfortunately pushed too early.

Signed-off-by: Michael Hanselmann <>
Reviewed-by: Iustin Pop <>

1b8e72f3 11/08/2012 03:20 pm Michael Hanselmann

rapi.testutils: Add utility to format HTTP headers

Once again this will be used by forthcoming RAPI test.

Signed-off-by: Michael Hanselmann <>
Reviewed-by: Iustin Pop <>

0351944b 11/08/2012 03:20 pm Michael Hanselmann

rapi.testutils: Return headers from mock utility

A newly added test for RAPI will also verify the returned headers. A
test in ganeti.rapi.client_unittest.py is split into smaller stand-alone
tests.

Signed-off-by: Michael Hanselmann <>
Reviewed-by: Iustin Pop <>

0e632cbd 11/08/2012 03:19 pm Michael Hanselmann

http: Add wrapper for mimetools.Message

A newly added piece of code will also have to parse headers, so having
this wrapper saves us from copying this part of code.

Signed-off-by: Michael Hanselmann <>
Reviewed-by: Iustin Pop <>

7a70541e 11/07/2012 06:57 pm Michael Hanselmann

Add missing tests for commit f0d2286

Commit f0d2286 changed the logic of
gnt_instance._ConvertNicDiskModifications to also allow a parameter
named “modify”. Unfortunately the corresponding unittest was not
updated. An “if”/“else” condition is also merged....

1251817b 11/07/2012 10:46 am Iustin Pop

Fix compatibility with newer Haskell libraries

This small patch fixes compatibility with a few newer Haskell libraries:

- base 4.6, included with ghc 7.6, removed the deprecated 'catch'
function from Prelude, so our "import Prelude hiding (catch)" is now...

5a5dde45 11/06/2012 08:19 pm Dimitris Aragiorgis

Merge branch 'stable-2.6-ippool-hotplug-esi' into debian-2.6

c6885eb9 11/06/2012 08:18 pm Dimitris Aragiorgis

Merge branch 'stable-2.6-hotplug' into stable-2.6-ippool-hotplug-esi

f89b3fc1 11/06/2012 08:10 pm Dimitris Aragiorgis

Hotplug: do not allow disk/0 to be hotplug-able

BIOS boots from first disk. If we enable hotplug in disk/0
it will added at the end of PCI address space (slot 31). If
another disk gets added then it will be added just before and
BIOS will try to boot from an non bootable device and the...

1f5557ca 11/06/2012 08:01 pm Guido Trotter

Fix gnt-instance console with xl

- Rename xm-console-wrapper to xen-console-wrapper
- Pass the xen command to use as a parameter

Signed-off-by: Guido Trotter <>
Reviewed-by: Iustin Pop <>

51dc9701 11/06/2012 06:56 pm Dimitris Aragiorgis

Update debian/changelog

Signed-off-by: Dimitris Aragiorgis <>

5506670c 11/06/2012 06:54 pm Dimitris Aragiorgis

Merge branch 'stable-2.6-ippool-hotplug-esi' into debian-2.6

65b8b768 11/06/2012 06:53 pm Dimitris Aragiorgis

Add debian tree

Signed-off-by: Dimitris Aragiorgis <>

57a6042e 11/06/2012 05:47 pm Guido Trotter

Disable E1101 on ganeti/http/server.py:424

Signed-off-by: Guido Trotter <>
Reviewed-by: Iustin Pop <>

053c356a 11/06/2012 04:32 pm Guido Trotter

Fix live migration under xl

Until now the only way to make live migration work in conjunction with
"xl" was to add ssh known_hosts keys for every node's secondary ip on
every other node.

With this command we remove the target key verification: this is not...

3135de69 11/06/2012 04:32 pm Guido Trotter

Don't check for xend port when using xl

If the toolstack is set to "xl" we shouldn't ping xend for liveness
before attempting a live migration.

Signed-off-by: Guido Trotter <>
Reviewed-by: Michael Hanselmann <>
Reviewed-by: Iustin Pop <>

268dca3a 11/05/2012 12:29 am Dimitris Aragiorgis

Merge branch 'stable-2.6' into stable-2.6-ippool-hotplug-esi

Conflicts:
lib/cmdlib.py

Signed-off-by: Dimitris Aragiorgis <>

88f622e0 11/01/2012 05:48 pm Michael Hanselmann

Fix typo in gnt-instance man page

Signed-off-by: Michael Hanselmann <>
Reviewed-by: Iustin Pop <>

942e2262 11/01/2012 05:48 pm Michael Hanselmann

jqueue: Return jobs to queue when shutting down

When a job is still waiting for locks and the queue is shutting down,
they should be returned and not actually start processing. Until now
jobs which transitioned from “queued” to “waiting” were already
considered to be running as far as the shutdown code was concerned....

bb600388 11/01/2012 05:09 pm Michael Hanselmann

gnt-debug delay: Add "--submit" option

Signed-off-by: Michael Hanselmann <>
Reviewed-by: Iustin Pop <>

233f4bc6 11/01/2012 03:00 pm Iustin Pop

Make hostname checks uniform between instance rename and add

Currently, we have instance rename doing extra checks on the host
name, to prevent accidental wrong renames; however, instance create
doesn't do these checks (issue 291), which (if DNS is misconfigured)...

4c91d2ad 11/01/2012 03:00 pm Iustin Pop

Improve logging of new job submissions

This addresses issue 290: when receiving new jobs, logging is
incomplete, and we don't have the job ID and/or summaries
logged. Only later, when the job is queried for or being processed, we
know more.

This is not good when troubleshooting, so let's improve the initial...

a9d40c65 11/01/2012 03:00 pm Iustin Pop

Improve handling of lock exceptions

There are two issues with lock exceptions right now:

- first, we don't log the original error; this is fine for now
(locking.py always returns the same error here), but in general is
brittle: if locking.py would start returning more information, we'd...

cfa2b7a0 10/30/2012 09:00 pm Iustin Pop

Add note about developing on a production machine

This is the bit of documentation missing for issue 170. Doing
development on a machine which already has Ganeti installed kind of
works, but only when the installed and the developed version are very
similar, and even then it can be problematic....

04da9087 10/30/2012 08:26 pm Dimitris Aragiorgis

Merge branch 'stable-2.6-ippool' into stable-2.6-ippool-hotplug-esi

b1e5ee06 10/30/2012 08:24 pm Dimitris Aragiorgis

Fix a bug intruduced when refactoring GenerateFree

Signed-off-by: Dimitris Aragiorgis <>

e15cada8 10/30/2012 07:55 pm Dimitris Aragiorgis

Merge branch 'stable-2.6-ippool' into stable-2.6-ippool-hotplug-esi

bc25ebb4 10/30/2012 07:50 pm Dimitris Aragiorgis

Fix a typo in OpNetworkSetParams

Signed-off-by: Dimitris Aragiorgis <>

a9d6eeb1 10/30/2012 07:41 pm Dimitris Aragiorgis

Merge branch 'stable-2.6-ippool' into stable-2.6-ippool-hotplug-esi

Conflicts:
lib/network.py

Signed-off-by: Dimitris Aragiorgis <>

48e734f3 10/30/2012 07:30 pm Dimitris Aragiorgis

Introduce new basic type TStringNone

Check if a certain value is "none". This is used by opcodes that
unset an object's attribute (set it to None), for instance
OpNetworkSetParams.

Signed-off-by: Dimitris Aragiorgis <>

0d324688 10/30/2012 04:07 pm Iustin Pop

Fix runtime memory increases

Commit 2c0af7da which added the runtime memory changes functionality
had a small typo (wrong name); I've rewritten this to only compute the
delta once, for simplicity.

Signed-off-by: Iustin Pop <>
Reviewed-by: Guido Trotter <>

922828a6 10/30/2012 03:38 pm Dimitris Aragiorgis

Use bitarray 0.8 interface

Signed-off-by: Dimitris Aragiorgis <>

326d8273 10/30/2012 03:37 pm Dimitris Aragiorgis

Simplify GenerateFree in network module

GenerateFree now returns the first available IP in the network
or raises AddressPoolError if it is full.

Signed-off-by: Dimitris Aragiorgis <>

e3fd65a4 10/30/2012 03:34 pm Dimitris Aragiorgis

Replace string values with proper constants

_UnlockedCommitIp is used either for releasing or reserving an
IP inside a network. New constants RELEASE_ACTION/RESERVE_ACTION
are used to decide which is the case.

Signed-off-by: Dimitris Aragiorgis <>

aa16d5a8 10/30/2012 03:31 pm Dimitris Aragiorgis

Simplify mac generation funtions

Introduce new config method _UnlockedGetNetworkMACPrefix and refactor
original _GenerateOneMAC so that it takes prefix as an optional argument
and returns a function that actually generates a MAC. If prefix is not
given or None it uses the cluster level default....

28ec01e6 10/30/2012 02:57 pm Dimitris Aragiorgis

Use bitarray 0.8 interface

Signed-off-by: Dimitris Aragiorgis <>

8e66b9bf 10/30/2012 02:17 pm Iustin Pop

Fix validation of vgname in OpClusterSetParams

This variable can be empty, when we want to disable LVM, so we can't
use TMaybeString.

Fixes issue 285.

Signed-off-by: Iustin Pop <>
Reviewed-by: Guido Trotter <>

e5dfc531 10/30/2012 02:17 pm Iustin Pop

Fix removal of storage directory on shared file storage

This patch makes _RemoveDisks symmetric to _CreateDisks with respect
to file-based storage: _CreateDisks uses "in constants.DTS_FILEBASED",
whereas _RemoveDisks was not update and only uses "==
constants.DT_FILE". This results in stale directories left on the...

15361a18 10/30/2012 02:17 pm Iustin Pop

Switch non-redundant check to disk template-based

Currently, the warning/notice about non-redundant instances in cluster
verify is based non empty secondaries list (how old is this?); the
proper way to check this nowadays is via DTS_MIRRORED.

Signed-off-by: Iustin Pop <>...

dc1e9a74 10/29/2012 02:19 pm Iustin Pop

Document the new --yes-do-it option for master-failover

Sorry, this should have gone in the previous commit, I forgot about
it.

Signed-off-by: Iustin Pop <>
Reviewed-by: Bernardo Dal Seno <>

6022a419 10/29/2012 01:59 pm Iustin Pop

Add option to force master-failover without voting

This fixes issue 282.

Signed-off-by: Iustin Pop <>
Reviewed-by: Bernardo Dal Seno <>

d976957d 10/26/2012 11:06 am Iustin Pop

Update instance modify message

Currently the message does not say explicitly that instance-initiated
reboots are useless to trigger the use of new parameters, per the
thread on the user mailing list. Let's improve it a bit.

Signed-off-by: Iustin Pop <>...

2081f0bd 10/26/2012 10:22 am Dimitris Aragiorgis

Merge branch 'stable-2.6-hotplug' into stable-2.6-ippool-hotplug-esi

Conflicts:
lib/config.py

Signed-off-by: Dimitris Aragiorgis <>

c1bfc2eb 10/25/2012 11:03 pm Dimitris Aragiorgis

Hotplug: rpc only if instance is running

Intruduce new function _InstanceRunning().
Fix *PCIInfo config methods to hold exclusively _config_lock and
take instance object as an argument.

Signed-off-by: Dimitris Aragiorgis <>

fa45c478 10/25/2012 01:20 pm Simon Deziel

Force tap's MAC prefix to "fe"

Setting a high prefix discourages the bridge from adopting the tap's
MAC. Xen is not affected by this since the MAC is forced to
"fe:ff:ff:ff:ff:ff".

This addresses issue #217.

Signed-off-by: Iustin Pop <>...

1b2ebbc0 10/24/2012 04:30 pm Dimitris Aragiorgis

Merge branch 'stable-2.6-ippool' into stable-2.6-ippool-hotplug-esi

8f4a22e3 10/24/2012 04:27 pm Dimitris Aragiorgis

Fix a bug in LUNetworkAdd concering needed_locks

Fix network client to pass conflicts_check to the opcode.

Signed-off-by: Dimitris Aragiorgis <>

ba147ff8 10/19/2012 04:57 pm Iustin Pop

Fix disk adoption interaction with ipolicy checks

In Ganeti 2.6, disk adoption is broken due to the ipolicy checks being
done before we read volume size from remote nodes. We fix this by
simply moving these checks to after the disk adoption code which
updates the disk size; it's not that nice that we fail a (almost)...

e6d2a198 10/19/2012 03:38 pm Dimitris Aragiorgis

Merge branch 'stable-2.6' into stable-2.6-ippool-hotplug-esi

312620ad 10/17/2012 05:51 pm Bernardo Dal Seno

Better NEWS file for 2.6.1

Better formatting of text, past tense used when appropriate.

Signed-off-by: Bernardo Dal Seno <>
Reviewed-by: Iustin Pop <>
Reviewed-by: Michael Hanselmann <>

781d828b 10/16/2012 04:54 pm Dimitris Aragiorgis

Fix OP_RESULT for OP_NETWORK_QUERY

Signed-off-by: Dimitris Aragiorgis <>

d27606cd 10/16/2012 03:53 pm Dimitris Aragiorgis

Allow passing 'none' for network_type option

Signed-off-by: Dimitris Aragiorgis <>

f2ee5004 10/16/2012 02:11 pm Dimitris Aragiorgis

Merge branch 'stable-2.6-ippool' into stable-2.6-ippool-hotplug-esi

da1168c5 10/16/2012 02:01 pm Dimitris Aragiorgis

Fixes to pass unittests (make check)

Conflicts:

doc/rapi.rst
lib/ovf.py

Signed-off-by: Dimitris Aragiorgis <>