| commit | a7ee757b99727ee3f9beffde69d067da2593cd5d | [log] [tgz] |
|---|---|---|
| author | buyingyi <buyingyi@123451ca-8445-de46-9d55-352943316053> | Mon Mar 25 07:37:09 2013 +0000 |
| committer | buyingyi <buyingyi@123451ca-8445-de46-9d55-352943316053> | Mon Mar 25 07:37:09 2013 +0000 |
| tree | 1f695e3f3f61052766ceb293be29d684efed7b97 | |
| parent | 48632b4bace77824799671bbddaf9cf36052ee86 [diff] | |
| parent | f5ee12b1e8c141e8cf407692572c8d4cfe9c424b [diff] |
merge -r3173:3188 https://hyracks.googlecode.com/svn/branches/fullstack_release_candidate@3234; merge -r 3209:3233 from trunk git-svn-id: https://hyracks.googlecode.com/svn/branches/fullstack_asterix_stabilization@3236 123451ca-8445-de46-9d55-352943316053
diff --git a/pregelix/pregelix-example/pom.xml b/pregelix/pregelix-example/pom.xml index 84feb78..20c45ec 100644 --- a/pregelix/pregelix-example/pom.xml +++ b/pregelix/pregelix-example/pom.xml
@@ -7,7 +7,7 @@ <parent> <groupId>edu.uci.ics.hyracks</groupId> <artifactId>pregelix</artifactId> - <version>0.2.3-SNAPSHOT</version> + <version>0.2.4-SNAPSHOT</version> </parent> <build> @@ -105,7 +105,7 @@ <dependency> <groupId>edu.uci.ics.hyracks</groupId> <artifactId>pregelix-core</artifactId> - <version>0.2.3-SNAPSHOT</version> + <version>0.2.4-SNAPSHOT</version> <type>jar</type> <scope>compile</scope> </dependency>
diff --git a/pregelix/pregelix-example/src/test/resources/topology.xml b/pregelix/pregelix-example/src/test/resources/topology.xml new file mode 100755 index 0000000..2a6c380 --- /dev/null +++ b/pregelix/pregelix-example/src/test/resources/topology.xml
@@ -0,0 +1,7 @@ +<cluster-topology> + <network-switch name="Global"> + <network-switch name="local"> + <terminal name="127.1.0.1"/> + </network-switch> + </network-switch> +</cluster-topology> \ No newline at end of file