git://git.onelab.eu / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 1c1bee7 f3bb737)
Merge commit 'origin/master'
authorroot <root@cassidy.cs.princeton.edu>
Wed, 1 Dec 2010 17:10:28 +0000 (12:10 -0500)
committerroot <root@cassidy.cs.princeton.edu>
Wed, 1 Dec 2010 17:10:28 +0000 (12:10 -0500)
1  2 
onelab-k27-tags.mk patch | diff1 | diff2 | blob | history
planetlab-k27-tags.mk patch | diff1 | diff2 | blob | history
planetlab-k32-tags.mk patch | diff1 | diff2 | blob | history
planetlab-tags.mk patch | diff1 | diff2 | blob | history

diff --combined onelab-k27-tags.mk
index 2473e89,8fd8639..2136da3
--- 1/onelab-k27-tags.mk
--- 2/onelab-k27-tags.mk
+++ b/onelab-k27-tags.mk
@@@ -20,7 -20,7 +20,7 @@@ libnl-SVNPATH                 := http://svn.planet-la
  util-vserver-pl-GITPATH               := git://git.onelab.eu/util-vserver-pl.git@util-vserver-pl-0.4-20
  nodeupdate-GITPATH            := git://git.onelab.eu/nodeupdate.git@NodeUpdate-0.5-6
  PingOfDeath-SVNPATH           := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
 -nodemanager-GITPATH             := git://git.onelab.eu/nodemanager.git@nodemanager-2.0-22
 +nodemanager-GITPATH             := git://git.onelab.eu/nodemanager.git@nodemanager-2.0-23
  pl_sshd-SVNPATH                       := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11
  codemux-GITPATH                       := git://git.onelab.eu/codemux.git@CoDemux-0.1-14
  fprobe-ulog-SVNPATH             := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-2
@@@ -40,16 -40,16 +40,16 @@@ PLCRT-SVNPATH                      := http://svn.planet-la
  pyopenssl-SVNPATH             := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1
  ###
  pyaspects-GITPATH             := git://git.onelab.eu/pyaspects.git@pyaspects-0.4.1-0
- ejabberd-GITPATH              := git://git.onelab.eu/ejabberd.git@ejabberd-2.1.3-1
+ ejabberd-GITPATH              := git://git.onelab.eu/ejabberd.git@ejabberd-2.1.3-2
  omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-8
  ###
- sfa-GITPATH                     := git://git.onelab.eu/sfa.git@sfa-1.0-8
+ sfa-GITPATH                   := git://git.onelab.eu/sfa.git@master
  sface-GITPATH                   := git://git.onelab.eu/sface.git@sface-0.1-3
  nodeconfig-SVNPATH            := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-5.0-3
  bootmanager-GITPATH             := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-12
  pypcilib-GITPATH              := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-9
  pyplnet-GITPATH                       := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-6
- bootcd-GITPATH                  := git://git.onelab.eu/bootcd.git@bootcd-5.0-5
+ bootcd-GITPATH                  := git://git.onelab.eu/bootcd.git@bootcd-5.0-6
  vserver-reference-GITPATH        := git://git.onelab.eu/vserver-reference.git@VserverReference-5.0-3
  bootstrapfs-GITPATH             := git://git.onelab.eu/bootstrapfs.git@BootstrapFS-2.0-6
  myplc-GITPATH                   := git://git.onelab.eu/myplc.git@myplc-5.0-12
diff --combined planetlab-k27-tags.mk
index da29612,f819cfb..d181961
--- 1/planetlab-k27-tags.mk
--- 2/planetlab-k27-tags.mk
+++ b/planetlab-k27-tags.mk
@@@ -12,7 -12,7 +12,7 @@@ libnl-SVNPATH                 := http://svn.planet-la
  util-vserver-pl-GITPATH               := git://git.planet-lab.org/util-vserver-pl.git@util-vserver-pl-0.4-20
  nodeupdate-GITPATH            := git://git.planet-lab.org/nodeupdate.git@NodeUpdate-0.5-6
  PingOfDeath-SVNPATH           := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
 -nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-22
 +nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-23
  # Trellis-specific NodeManager plugins
  NodeManager-topo-SVNPATH      := http://svn.planet-lab.org/svn/NodeManager-topo/trunk
  NodeManager-optin-SVNPATH     := http://svn.planet-lab.org/svn/NodeManager-optin/trunk
@@@ -35,7 -35,7 +35,7 @@@ PLCRT-SVNPATH                 := http://svn.planet-la
  pyopenssl-SVNPATH             := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1
  ###
  pyaspects-GITPATH             := git://git.planet-lab.org/pyaspects.git@pyaspects-0.4.1-0
- ejabberd-GITPATH              := git://git.planet-lab.org/ejabberd.git@ejabberd-2.1.3-1
+ ejabberd-GITPATH              := git://git.planet-lab.org/ejabberd.git@ejabberd-2.1.3-2
  omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-8
  ###
  sfa-GITPATH                   := git://git.planet-lab.org/sfa.git@sfa-1.0-8
@@@ -45,7 -45,7 +45,7 @@@ pyplnet-GITPATH                       := git://git.planet-l
  DistributedRateLimiting-SVNPATH       := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1
  pcucontrol-GITPATH              := git://git.planet-lab.org/pcucontrol.git@pcucontrol-1.0-8
  bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-12
- bootcd-GITPATH                  := git://git.planet-lab.org/bootcd.git@bootcd-5.0-5
+ bootcd-GITPATH                  := git://git.planet-lab.org/bootcd.git@bootcd-5.0-6
  vserver-reference-GITPATH        := git://git.planet-lab.org/vserver-reference.git@VserverReference-5.0-3
  bootstrapfs-GITPATH             := git://git.planet-lab.org/bootstrapfs.git@BootstrapFS-2.0-6
  myplc-GITPATH                   := git://git.planet-lab.org/myplc.git@myplc-5.0-12
diff --combined planetlab-k32-tags.mk
index 1e84e8e,939d4d6..4638698
--- 1/planetlab-k32-tags.mk
--- 2/planetlab-k32-tags.mk
+++ b/planetlab-k32-tags.mk
@@@ -12,7 -12,7 +12,7 @@@ libnl-SVNPATH                 := http://svn.planet-la
  util-vserver-pl-GITPATH               := git://git.planet-lab.org/util-vserver-pl.git@util-vserver-pl-0.4-20
  nodeupdate-GITPATH            := git://git.planet-lab.org/nodeupdate.git@NodeUpdate-0.5-6
  PingOfDeath-SVNPATH           := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
 -nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-22
 +nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-23
  # Trellis-specific NodeManager plugins
  NodeManager-topo-SVNPATH      := http://svn.planet-lab.org/svn/NodeManager-topo/trunk
  NodeManager-optin-SVNPATH     := http://svn.planet-lab.org/svn/NodeManager-optin/trunk
@@@ -35,7 -35,7 +35,7 @@@ PLCRT-SVNPATH                 := http://svn.planet-la
  pyopenssl-SVNPATH             := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1
  ###
  pyaspects-GITPATH             := git://git.planet-lab.org/pyaspects.git@pyaspects-0.4.1-0
- ejabberd-GITPATH              := git://git.planet-lab.org/ejabberd.git@ejabberd-2.1.3-1
+ ejabberd-GITPATH              := git://git.planet-lab.org/ejabberd.git@ejabberd-2.1.3-2
  omf-GITPATH                     := git://git.planet-lab.org/omf.git@omf-5.3-8
  ###
  sfa-GITPATH                   := git://git.planet-lab.org/sfa.git@sfa-1.0-8
@@@ -43,7 -43,7 +43,7 @@@ nodeconfig-SVNPATH            := http://svn.plane
  bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-12
  pypcilib-GITPATH              := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-9
  pyplnet-GITPATH                       := git://git.planet-lab.org/pyplnet.git@pyplnet-4.3-6
- bootcd-GITPATH                  := git://git.planet-lab.org/bootcd.git@bootcd-5.0-5
+ bootcd-GITPATH                  := git://git.planet-lab.org/bootcd.git@bootcd-5.0-6
  vserver-reference-GITPATH        := git://git.planet-lab.org/vserver-reference.git@VserverReference-5.0-3
  bootstrapfs-GITPATH             := git://git.planet-lab.org/bootstrapfs.git@BootstrapFS-2.0-6
  myplc-GITPATH                   := git://git.planet-lab.org/myplc.git@myplc-5.0-12
diff --combined planetlab-tags.mk
index 0ea5435,d983e10..396cd1d
--- 1/planetlab-tags.mk
--- 2/planetlab-tags.mk
+++ b/planetlab-tags.mk
@@@ -16,7 -16,7 +16,7 @@@ util-vserver-pl-GITPATH               := git://git.p
  nodeupdate-GITPATH            := git://git.planet-lab.org/nodeupdate.git@NodeUpdate-0.5-6
  PingOfDeath-SVNPATH           := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
  pl_sshd-SVNPATH                       := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11
 -nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-22
 +nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-23
  pl_sshd-SVNPATH                       := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11
  codemux-GITPATH                       := git://git.planet-lab.org/codemux.git@CoDemux-0.1-14
  fprobe-ulog-SVNPATH             := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-2
@@@ -36,7 -36,7 +36,7 @@@ PLCRT-SVNPATH                 := http://svn.planet-la
  pyopenssl-SVNPATH             := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1
  ###
  pyaspects-GITPATH             := git://git.planet-lab.org/pyaspects.git@pyaspects-0.4.1-0
- ejabberd-GITPATH              := git://git.planet-lab.org/ejabberd.git@ejabberd-2.1.3-1
+ ejabberd-GITPATH              := git://git.planet-lab.org/ejabberd.git@ejabberd-2.1.3-2
  omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-8
  ###
  sfa-GITPATH                   := git://git.planet-lab.org/sfa.git@sfa-1.0-8
@@@ -44,7 -44,7 +44,7 @@@ nodeconfig-SVNPATH            := http://svn.plane
  bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-12
  pypcilib-GITPATH              := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-9
  pyplnet-GITPATH                       := git://git.planet-lab.org/pyplnet.git@pyplnet-4.3-6
- bootcd-GITPATH                  := git://git.planet-lab.org/bootcd.git@bootcd-5.0-5
+ bootcd-GITPATH                  := git://git.planet-lab.org/bootcd.git@bootcd-5.0-6
  vserver-reference-GITPATH        := git://git.planet-lab.org/vserver-reference.git@VserverReference-5.0-3
  bootstrapfs-GITPATH             := git://git.planet-lab.org/bootstrapfs.git@BootstrapFS-2.0-6
  myplc-GITPATH                   := git://git.planet-lab.org/myplc.git@myplc-5.0-12
build