Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/8c7623ac Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/8c7623ac Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/8c7623ac Branch: refs/heads/master Commit: 8c7623ac82569fc1d05f51a76dd7f2639324fa19 Parents: df066a0 8997301 Author: Lahiru Sandaruwan <[email protected]> Authored: Sun Jan 19 10:14:58 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Sun Jan 19 10:14:58 2014 +0530 ---------------------------------------------------------------------- .../stratos/cartridge/agent/CartridgeAgent.java | 2 + .../synchronizer/RepositoryInformation.java | 7 +++ .../git/impl/GitBasedArtifactRepository.java | 45 ++++++++++++-------- .../config/CartridgeAgentConfiguration.java | 14 +++++- .../agent/util/CartridgeAgentConstants.java | 1 + 5 files changed, 50 insertions(+), 19 deletions(-) ----------------------------------------------------------------------
