You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by tk...@apache.org on 2013/03/06 17:59:13 UTC
[3/3] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-marmotta
Updated Branches:
refs/heads/master 5d77910f3 -> f3e155765
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/f3e15576
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/f3e15576
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/f3e15576
Branch: refs/heads/master
Commit: f3e155765cd8baf6c6379fc0f171a80101f164de
Parents: db6166d 5d77910
Author: tkurz <tk...@apache.org>
Authored: Wed Mar 6 17:59:08 2013 +0100
Committer: tkurz <tk...@apache.org>
Committed: Wed Mar 6 17:59:08 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(-)
----------------------------------------------------------------------