You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by lh...@apache.org on 2010/05/21 20:26:19 UTC
svn commit: r947118 - /incubator/shiro/branches/shiro-root-1.0.x/pom.xml
Author: lhazlewood
Date: Fri May 21 18:26:18 2010
New Revision: 947118
URL: http://svn.apache.org/viewvc?rev=947118&view=rev
Log:
Merged developer info from trunk into the 1.0.x branch
Modified:
incubator/shiro/branches/shiro-root-1.0.x/pom.xml (contents, props changed)
Modified: incubator/shiro/branches/shiro-root-1.0.x/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shiro/branches/shiro-root-1.0.x/pom.xml?rev=947118&r1=947117&r2=947118&view=diff
==============================================================================
--- incubator/shiro/branches/shiro-root-1.0.x/pom.xml (original)
+++ incubator/shiro/branches/shiro-root-1.0.x/pom.xml Fri May 21 18:26:18 2010
@@ -105,6 +105,10 @@
<id>jhaile</id>
<name>Jeremy Haile</name>
<email>jhaile@apache.org</email>
+ <url>http://www.jeremyhaile.com</url>
+ <organization>Mobilization Labs</organization>
+ <organizationUrl>http://www.mobilizationlabs.com</organizationUrl>
+ <timezone>-5</timezone>
</developer>
<developer>
<id>lhazlewood</id>
@@ -126,7 +130,11 @@
<developer>
<id>pledbrook</id>
<name>Peter Ledbrook</name>
- <email>pledbrook@apache.org</email>
+ <email>p.ledbrook@cacoethes.co.uk</email>
+ <url>http://www.cacoethes.co.uk/blog/</url>
+ <organization>SpringSource</organization>
+ <organizationUrl>http://www.springsource.com/</organizationUrl>
+ <timezone>0</timezone>
</developer>
<developer>
<id>tveil</id>
Propchange: incubator/shiro/branches/shiro-root-1.0.x/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 21 18:26:18 2010
@@ -0,0 +1,2 @@
+/incubator/shiro/branches/session_manager_API_change/pom.xml:945409-945995
+/incubator/shiro/trunk/pom.xml:946769-947101