You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2015/11/16 20:46:45 UTC
[2/2] karaf-cellar git commit: Merge branch 'KARAF-4112' of
https://github.com/oscerd/karaf-cellar
Merge branch 'KARAF-4112' of https://github.com/oscerd/karaf-cellar
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/c30f1ba1
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/c30f1ba1
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/c30f1ba1
Branch: refs/heads/master
Commit: c30f1ba1420182f30e48c307a2944d0a4688387b
Parents: e277c99 1747517
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Mon Nov 16 20:43:12 2015 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Mon Nov 16 20:43:12 2015 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/c30f1ba1/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 43f6f78,d4bf01d..84254a1
--- a/pom.xml
+++ b/pom.xml
@@@ -41,8 -41,8 +41,8 @@@
<felix.bundlerepository.version>2.0.4</felix.bundlerepository.version>
<felix.utils.version>1.8.0</felix.utils.version>
<felix.webconsole.version>4.2.8</felix.webconsole.version>
- <hazelcast.version>3.5.2</hazelcast.version>
+ <hazelcast.version>3.5.3</hazelcast.version>
- <jclouds.version>1.8.1</jclouds.version>
+ <jclouds.version>1.9.1</jclouds.version>
<joda-time.version>2.5</joda-time.version>
<junit.version>4.11</junit.version>
<karaf.version>4.0.0</karaf.version>