You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2014/12/22 20:01:51 UTC
[3/4] isis git commit: Merge remote-tracking branch 'jdbranham/master'
Merge remote-tracking branch 'jdbranham/master'
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/fe30771a
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/fe30771a
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/fe30771a
Branch: refs/heads/master
Commit: fe30771aecaedd0d4963e5cefca306fb17bb94b0
Parents: de823cf 81dbfd8
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Dec 22 17:06:28 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Dec 22 17:06:28 2014 +0000
----------------------------------------------------------------------
.../jdo/datanucleus/DataNucleusApplicationComponents.java | 8 +++++---
example/application/simpleapp/webapp/.gitignore | 1 +
example/application/simpleapp/webapp/pom.xml | 10 ++++++++++
.../webapp/src/main/webapp/WEB-INF/persistor.properties | 5 ++++-
example/application/todoapp/webapp/.gitignore | 1 +
example/application/todoapp/webapp/pom.xml | 10 ++++++++++
.../webapp/src/main/webapp/WEB-INF/persistor.properties | 5 ++++-
7 files changed, 35 insertions(+), 5 deletions(-)
----------------------------------------------------------------------