You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ss...@apache.org on 2013/03/06 20:48:24 UTC
[3/6] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-marmotta
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-marmotta
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/8a5fb25f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/8a5fb25f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/8a5fb25f
Branch: refs/heads/master
Commit: 8a5fb25ff8fead3532822f19dacea6ccde6894bc
Parents: bccb299 5d77910
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Wed Mar 6 17:44:40 2013 +0100
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Wed Mar 6 17:44:40 2013 +0100
----------------------------------------------------------------------
.../core/api/config/ConfigurationService.java | 22 ++++-
.../services/config/ConfigurationServiceImpl.java | 63 ++++++++----
.../core/startup/MarmottaStartupService.java | 76 ++++++++------
3 files changed, 104 insertions(+), 57 deletions(-)
----------------------------------------------------------------------