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 2012/08/12 03:13:28 UTC

svn commit: r1372043 - /shiro/tags/trunk_pre_SHIRO-317b_integration/

Author: lhazlewood
Date: Sun Aug 12 01:13:28 2012
New Revision: 1372043

URL: http://svn.apache.org/viewvc?rev=1372043&view=rev
Log:
SHIRO-317: tagging trunk before integrating the SHIRO-317b branch in case we want/need to roll back.

Added:
    shiro/tags/trunk_pre_SHIRO-317b_integration/   (props changed)
      - copied from r1372042, shiro/trunk/

Propchange: shiro/tags/trunk_pre_SHIRO-317b_integration/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Aug 12 01:13:28 2012
@@ -0,0 +1,11 @@
+*.idea
+*.iml
+*.ipr
+*.iws
+.classpath
+.externalToolBuilders
+.project
+.settings
+target
+out
+

Propchange: shiro/tags/trunk_pre_SHIRO-317b_integration/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Aug 12 01:13:28 2012
@@ -0,0 +1,2 @@
+/incubator/shiro/branches/session_manager_API_change:945409-945995
+/shiro/branches/1.2.x:1298909,1331027,1340194,1362116,1363744,1364194,1364198-1364199,1365167,1365191,1365275,1365297,1365311