You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2008/05/10 17:35:21 UTC
svn commit: r655113 - in /directory/sandbox/akarasulu/bigbang:
daemon/LAST_BIG_BANG_MERGE daemon/bootstrappers/pom.xml
daemon/plugin/pom.xml daemon/pom.xml project/LAST_BIG_BANG_MERGE
project/pom.xml project/resources/gpg-sign-all
Author: akarasulu
Date: Sat May 10 08:35:20 2008
New Revision: 655113
URL: http://svn.apache.org/viewvc?rev=655113&view=rev
Log:
merging in changes from bigbang before replacing bigbang with private branch
Added:
directory/sandbox/akarasulu/bigbang/project/LAST_BIG_BANG_MERGE
directory/sandbox/akarasulu/bigbang/project/resources/gpg-sign-all
- copied unchanged from r655111, directory/project/branches/bigbang/resources/gpg-sign-all
Modified:
directory/sandbox/akarasulu/bigbang/daemon/LAST_BIG_BANG_MERGE
directory/sandbox/akarasulu/bigbang/daemon/bootstrappers/pom.xml
directory/sandbox/akarasulu/bigbang/daemon/plugin/pom.xml
directory/sandbox/akarasulu/bigbang/daemon/pom.xml
directory/sandbox/akarasulu/bigbang/project/pom.xml
Modified: directory/sandbox/akarasulu/bigbang/daemon/LAST_BIG_BANG_MERGE
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/daemon/LAST_BIG_BANG_MERGE?rev=655113&r1=655112&r2=655113&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/daemon/LAST_BIG_BANG_MERGE (original)
+++ directory/sandbox/akarasulu/bigbang/daemon/LAST_BIG_BANG_MERGE Sat May 10 08:35:20 2008
@@ -12,16 +12,23 @@
svn merge -r 604351:613581 https://svn.apache.org/repos/asf/directory/daemon/branches/bigbang .
NOTHING CHANGED ...
+
Tue Mar 18 00:47:53 EDT 2008
----------------------------
svn merge -r 613581:638212 https://svn.apache.org/repos/asf/directory/daemon/branches/bigbang .
+
Fri Mar 28 22:56:07 EDT 2008
----------------------------
svn merge -r 638212:642492 https://svn.apache.org/repos/asf/directory/daemon/branches/bigbang .
+
Wed Apr 16 22:35:35 EDT 2008
----------------------------
svn merge -r 642492:648922 https://svn.apache.org/repos/asf/directory/daemon/branches/bigbang .
+Sat May 10 11:32:48 EDT 2008
+----------------------------
+svn merge -r 648922:655112 https://svn.apache.org/repos/asf/directory/daemon/branches/bigbang .
+
Modified: directory/sandbox/akarasulu/bigbang/daemon/bootstrappers/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/daemon/bootstrappers/pom.xml?rev=655113&r1=655112&r2=655113&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/daemon/bootstrappers/pom.xml (original)
+++ directory/sandbox/akarasulu/bigbang/daemon/bootstrappers/pom.xml Sat May 10 08:35:20 2008
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.directory.daemon</groupId>
<artifactId>daemon-parent</artifactId>
- <version>1.1.4-SNAPSHOT</version>
+ <version>1.1.5-SNAPSHOT</version>
</parent>
<artifactId>daemon-bootstrappers</artifactId>
<name>Apache Directory Daemon Bootstrappers</name>
Modified: directory/sandbox/akarasulu/bigbang/daemon/plugin/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/daemon/plugin/pom.xml?rev=655113&r1=655112&r2=655113&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/daemon/plugin/pom.xml (original)
+++ directory/sandbox/akarasulu/bigbang/daemon/plugin/pom.xml Sat May 10 08:35:20 2008
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.directory.daemon</groupId>
<artifactId>daemon-parent</artifactId>
- <version>1.1.4-SNAPSHOT</version>
+ <version>1.1.5-SNAPSHOT</version>
</parent>
<artifactId>daemon-plugin</artifactId>
<name>Apache Directory Daemon Plugin (Maven 2)</name>
Modified: directory/sandbox/akarasulu/bigbang/daemon/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/daemon/pom.xml?rev=655113&r1=655112&r2=655113&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/daemon/pom.xml (original)
+++ directory/sandbox/akarasulu/bigbang/daemon/pom.xml Sat May 10 08:35:20 2008
@@ -31,7 +31,7 @@
<name>Apache Directory Daemon</name>
<packaging>pom</packaging>
<!-- note that this skipped a RC in being bumped up -->
- <version>1.1.4-SNAPSHOT</version>
+ <version>1.1.5-SNAPSHOT</version>
<description>
Reusable framework for daemon applications based on Commons Daemon
Jsvc and Procrun. A small installation layout pattern combined with
Added: directory/sandbox/akarasulu/bigbang/project/LAST_BIG_BANG_MERGE
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/project/LAST_BIG_BANG_MERGE?rev=655113&view=auto
==============================================================================
--- directory/sandbox/akarasulu/bigbang/project/LAST_BIG_BANG_MERGE (added)
+++ directory/sandbox/akarasulu/bigbang/project/LAST_BIG_BANG_MERGE Sat May 10 08:35:20 2008
@@ -0,0 +1,14 @@
+$Rev$
+$Date$
+
+This file shows the last time I merged from the big bang branch here as a commit
+number:
+
+ https://svn.apache.org/repos/asf/directory/project/branches/bigbang/
+
+
+Sat May 10 11:32:48 EDT 2008
+----------------------------
+svn merge -r 6489222:655112 https://svn.apache.org/repos/asf/directory/daemon/branches/bigbang .
+
+
Modified: directory/sandbox/akarasulu/bigbang/project/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/project/pom.xml?rev=655113&r1=655112&r2=655113&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/project/pom.xml (original)
+++ directory/sandbox/akarasulu/bigbang/project/pom.xml Sat May 10 08:35:20 2008
@@ -32,7 +32,7 @@
<artifactId>project</artifactId>
<packaging>pom</packaging>
<name>Apache Directory Project</name>
- <version>11-SNAPSHOT</version>
+ <version>12-SNAPSHOT</version>
<ciManagement>
<system>continuum</system>