| commit | f3777d13d53ac5a17a252811770948236e8a4a10 | [log] [tgz] |
|---|---|---|
| author | buyingyi <buyingyi@123451ca-8445-de46-9d55-352943316053> | Sun Mar 24 07:20:08 2013 +0000 |
| committer | buyingyi <buyingyi@123451ca-8445-de46-9d55-352943316053> | Sun Mar 24 07:20:08 2013 +0000 |
| tree | c837093e846e6c1552cc220570ef57b8883a012d | |
| parent | ded86f76a0731fba2e2848e58f99de43d060d2a8 [diff] |
cross merge fullstack_release_candidate into trunk git-svn-id: https://hyracks.googlecode.com/svn/trunk/fullstack@3208 123451ca-8445-de46-9d55-352943316053
diff --git a/pregelix-core/src/test/resources/hadoop/conf/mapred-site.xml b/pregelix-core/src/test/resources/hadoop/conf/mapred-site.xml index 1b9a4d6..f89dd79 100644 --- a/pregelix-core/src/test/resources/hadoop/conf/mapred-site.xml +++ b/pregelix-core/src/test/resources/hadoop/conf/mapred-site.xml
@@ -18,8 +18,8 @@ <value>20</value> </property> <property> - <name>mapred.min.split.size</name> - <value>65536</value> + <name>mapred.max.split.size</name> + <value>4096</value> </property> </configuration>
diff --git a/pregelix-core/src/test/resources/topology.xml b/pregelix-core/src/test/resources/topology.xml new file mode 100755 index 0000000..4710706 --- /dev/null +++ b/pregelix-core/src/test/resources/topology.xml
@@ -0,0 +1,7 @@ +<cluster-topology> + <network-switch name="Global"> + <network-switch name="local"> + <terminal name="127.0.0.1"/> + </network-switch> + </network-switch> +</cluster-topology> \ No newline at end of file