Merge branch 'prepare/isis-security-shiro-1.0.0-RC1'
Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/1463987a Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/1463987a Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/1463987a Branch: refs/heads/master Commit: 1463987ab8c5a2eb22550c9e9f49af53e7176aec Parents: b5ea578 1c719be Author: Dan Haywood <danhayw...@apache.org> Authored: Thu Jan 10 18:53:20 2013 +0000 Committer: Dan Haywood <danhayw...@apache.org> Committed: Thu Jan 10 18:53:20 2013 +0000 ---------------------------------------------------------------------- component/security/shiro/pom.xml | 8 ++++---- .../appended-resources/supplemental-models.xml | 15 ++++++++++++++- 2 files changed, 18 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
