[1/2] karaf git commit: KARAF-3753 - include child system dir as default repo

[janstey]

Repository: karaf
Updated Branches:
  refs/heads/master a773dc5ff -> ffb706534


KARAF-3753 - include child system dir as default repo

Conflicts:
        
assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/898b0656
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/898b0656
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/898b0656

Branch: refs/heads/master
Commit: 898b0656ab5a806ffcf7a47467240fe2e3e0420b
Parents: a773dc5
Author: Jonathan Anstey <jans...@gmail.com>
Authored: Mon Jun 1 16:37:41 2015 -0230
Committer: Jonathan Anstey <jans...@gmail.com>
Committed: Mon Jun 1 16:41:03 2015 -0230

----------------------------------------------------------------------
 .../src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/898b0656/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg
----------------------------------------------------------------------
diff --git 
a/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg
 
b/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg
index 3f675df..bc2c34d 100644
--- 
a/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg
+++ 
b/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg
@@ -68,7 +68,8 @@ org.ops4j.pax.url.mvn.useFallbackRepositories=false
 #
 org.ops4j.pax.url.mvn.defaultRepositories=\
     
file:${karaf.home}/${karaf.default.repository}@id=system.repository@snapshots, \
-    file:${karaf.data}/kar@id=kar.repository@multi@snapshots
+    file:${karaf.data}/kar@id=kar.repository@multi@snapshots, \
+    
file:${karaf.base}/${karaf.default.repository}@id=child.system.repository@snapshots
 
 # Use the default local repo (e.g.~/.m2/repository) as a "remote" repo
 #org.ops4j.pax.url.mvn.defaultLocalRepoAsRemote=false