Palacios Public Git Repository

To checkout Palacios execute 

  git clone http://v3vee.org/palacios/palacios.web/palacios.git
This will give you the master branch. You probably want the devel branch or one of the release branches. To switch to the devel branch, simply execute 
  cd palacios
  git checkout --track -b devel origin/devel
The other branches are similar.

projects / palacios.git / commitdiff
? search: re
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6ed3385 5ac6ebe)
Merge branch 'devel' of palacios@newskysaw.cs.northwestern.edu:/home/palacios/palacio...
Lei Xia [Fri, 6 May 2011 02:50:06 +0000 (21:50 -0500)]
Conflicts:

palacios/src/vnet/Makefile

1  2 
linux_module/Makefile patch | diff1 | diff2 | blob | history
palacios/src/palacios/vmm.c patch | diff1 | diff2 | blob | history
palacios/src/vnet/Makefile patch | diff1 | diff2 | blob | history

diff --cc linux_module/Makefile
Simple merge
diff --cc palacios/src/palacios/vmm.c
Simple merge
diff --cc palacios/src/vnet/Makefile
index 0433652,5140f3e..2b8f357
--- 1/palacios/src/vnet/Makefile
--- 2/palacios/src/vnet/Makefile
+++ b/palacios/src/vnet/Makefile
@@@ -1,2 -1,3 +1,3 @@@
 +obj-$(V3_CONFIG_VNET) +=  vnet_core.o vnet_host.o vnet_hashtable.o
+ obj-y += null.o
 -obj-$(V3_CONFIG_VNET) +=  vnet_core.o
  
Public Palacios Development Repository for the V3VEE Project