Merge branch 'SM-2870' of https://github.com/oscerd/servicemix-bundles
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/repo
Commit:
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/commit/3163187d
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/3163187d
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/3163187d
Branch: refs/heads/master
Commit: 3163187d69294117c72a9188e15fb85dd75372da
Parents: 89d1875 2117520
Author: Jean-Baptiste Onofré <[email protected]>
Authored: Mon Feb 15 13:53:23 2016 +0100
Committer: Jean-Baptiste Onofré <[email protected]>
Committed: Mon Feb 15 13:53:23 2016 +0100
----------------------------------------------------------------------
chunk-templates-3.2.0/pom.xml | 116 +++++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 11 ++
pom.xml | 1 +
3 files changed, 128 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/3163187d/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 67a9b38,52673d2..0595c21
--- a/pom.xml
+++ b/pom.xml
@@@ -44,12 -44,7 +44,13 @@@
<modules>
<!-- add modules for all bundles to released in the next batch here
-->
<module>jest-0.1.6</module>
+ <module>elasticsearch-2.2.0</module>
+ <module>elasticsearch-2.1.1</module>
+ <module>elasticsearch-2.1.0</module>
+ <module>elasticsearch-2.0.2</module>
+ <module>elasticsearch-2.0.1</module>
+ <module>elasticsearch-2.0.0</module>
+ <module>chunk-templates-3.2.0</module>
</modules>
</project>
