Merge branch 'streaming_test' into streaming

Conflicts: nephele/nephele-streaming/src/main/java/eu/stratosphere/nephele/streaming/StreamingJobManagerPlugin.java
VonRosenchild · Nov 20, 2011 · 54412a4 · 54412a4
2 parents d0b38e4 + c42372b
commit 54412a4
Show file tree

Hide file tree

Showing 83 changed files with 3,613 additions and 2,449 deletions.
diff --git a/nephele/nephele-clustermanager/pom.xml b/nephele/nephele-clustermanager/pom.xml
@@ -8,10 +8,8 @@
 
  <modelVersion>4.0.0</modelVersion>
 
- <groupId>eu.stratosphere</groupId>
  <artifactId>nephele-clustermanager</artifactId>
  <name>nephele-clustermanager</name>
- <version>0.2</version>
  <url>https://maven.apache.org</url>
 
  <dependencies>

diff --git a/nephele/nephele-common/pom.xml b/nephele/nephele-common/pom.xml
@@ -9,9 +9,7 @@
  <version>0.2</version>
  </parent>
 
- <groupId>eu.stratosphere</groupId>
  <artifactId>nephele-common</artifactId>
- <version>0.2</version>
  <name>nephele-common</name>
 
  <packaging>jar</packaging>