diff options
| author | Justin Pettit <jpettit@nicira.com> | 2009-09-12 00:49:30 -0700 |
|---|---|---|
| committer | Justin Pettit <jpettit@nicira.com> | 2009-09-12 00:49:30 -0700 |
| commit | 39fb08818bbd9c438dbf23caa89937c663451b5a (patch) | |
| tree | a317d5161f3a7efd4e6e7cc5ccbf54d6807e5fe7 /Makefile.am | |
| parent | 6867bc3633fc5734eb81cd8684f0fed5df319bdd (diff) | |
| parent | 7646deb6ec8c3a319573ac9ea9a19a60994f7cf3 (diff) | |
Merge commit 'origin/citrix'
Conflicts:
vswitchd/ovs-vswitchd.8.in
vswitchd/ovs-vswitchd.conf.5.in
xenserver/etc_init.d_vswitch
Diffstat (limited to 'Makefile.am')
0 files changed, 0 insertions, 0 deletions