You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2011/04/27 01:24:03 UTC
svn commit: r1096963 - in /geronimo/server: branches/3.0-osgi/ trunk/
Author: djencks
Date: Tue Apr 26 23:24:02 2011
New Revision: 1096963
URL: http://svn.apache.org/viewvc?rev=1096963&view=rev
Log:
move osgi work to branch
Added:
geronimo/server/branches/3.0-osgi/ (props changed)
- copied from r1096962, geronimo/server/trunk/
Removed:
geronimo/server/trunk/
Propchange: geronimo/server/branches/3.0-osgi/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Tue Apr 26 23:24:02 2011
@@ -0,0 +1,4 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/m2migration:428851
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk:428882
+bdd66121-cd02-4950-91dc-3687ae657a63:/geronimo/server-trunk:16301
+bdd66121-cd02-4950-91dc-3687ae657a63:/geronimo/trunk-reorg:12578
Propchange: geronimo/server/branches/3.0-osgi/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Apr 26 23:24:02 2011
@@ -0,0 +1,10 @@
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+*.log
+junit*.properties
+target
+bin
+.settings
Propchange: geronimo/server/branches/3.0-osgi/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Apr 26 23:24:02 2011
@@ -0,0 +1,2 @@
+/geronimo/server/branches/2.2:832538,885058
+/geronimo/server/branches/3.0-M1:948864,951792