Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b53b8cff Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b53b8cff Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b53b8cff Branch: refs/heads/master Commit: b53b8cff6683007116be659c6f834f6834b03328 Parents: c35b70c 52ef7c6 Author: Bill Havanki <bhava...@cloudera.com> Authored: Fri Jan 17 12:16:58 2014 -0500 Committer: Bill Havanki <bhava...@cloudera.com> Committed: Fri Jan 17 12:16:58 2014 -0500 ---------------------------------------------------------------------- .../system/randomwalk/conf/modules/LongEach.xml | 54 ++++++++++++++++++++ .../randomwalk/conf/modules/ShortEach.xml | 54 ++++++++++++++++++++ 2 files changed, 108 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/b53b8cff/test/system/randomwalk/conf/modules/LongEach.xml ---------------------------------------------------------------------- diff --cc test/system/randomwalk/conf/modules/LongEach.xml index 0000000,b1e6f54..5863341 mode 000000,100644..100644 --- a/test/system/randomwalk/conf/modules/LongEach.xml +++ b/test/system/randomwalk/conf/modules/LongEach.xml @@@ -1,0 -1,50 +1,54 @@@ + <?xml version="1.0" encoding="UTF-8"?> + <!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + <module> + + <init id="Image.xml"/> + + <node id="Image.xml" maxSec="3600" teardown="true"> + <edge id="Sequential.xml" weight="1"/> + </node> + + <node id="Sequential.xml" maxSec="3600" teardown="true"> + <edge id="MultiTable.xml" weight="1"/> + </node> + + <node id="MultiTable.xml" maxSec="3600" teardown="true"> + <edge id="Shard.xml" weight="1"/> + </node> + + <node id="Shard.xml" maxSec="3600" teardown="true"> + <edge id="Concurrent.xml" weight="1"/> + </node> + + <node id="Concurrent.xml" maxSec="3600" teardown="true"> + <edge id="Security.xml" weight="1"/> + </node> + + <node id="Security.xml" maxSec="3600" teardown="true"> + <edge id="Bulk.xml" weight="1"/> + </node> + + <node id="Bulk.xml" maxSec="3600" teardown="true"> ++ <edge id="Conditional.xml" weight="1"/> ++</node> ++ ++<node id="Conditional.xml" maxSec="3600" teardown="true"> + <edge id="END" weight="1"/> + </node> + + </module> http://git-wip-us.apache.org/repos/asf/accumulo/blob/b53b8cff/test/system/randomwalk/conf/modules/ShortEach.xml ---------------------------------------------------------------------- diff --cc test/system/randomwalk/conf/modules/ShortEach.xml index 0000000,d9c2744..fe7c857 mode 000000,100644..100644 --- a/test/system/randomwalk/conf/modules/ShortEach.xml +++ b/test/system/randomwalk/conf/modules/ShortEach.xml @@@ -1,0 -1,50 +1,54 @@@ + <?xml version="1.0" encoding="UTF-8"?> + <!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + <module> + + <init id="Image.xml"/> + + <node id="Image.xml" maxSec="300" teardown="true"> + <edge id="Sequential.xml" weight="1"/> + </node> + + <node id="Sequential.xml" maxSec="300" teardown="true"> + <edge id="MultiTable.xml" weight="1"/> + </node> + + <node id="MultiTable.xml" maxSec="300" teardown="true"> + <edge id="Shard.xml" weight="1"/> + </node> + + <node id="Shard.xml" maxSec="300" teardown="true"> + <edge id="Concurrent.xml" weight="1"/> + </node> + + <node id="Concurrent.xml" maxSec="300" teardown="true"> + <edge id="Security.xml" weight="1"/> + </node> + + <node id="Security.xml" maxSec="300" teardown="true"> + <edge id="Bulk.xml" weight="1"/> + </node> + + <node id="Bulk.xml" maxSec="300" teardown="true"> ++ <edge id="Conditional.xml" weight="1"/> ++</node> ++ ++<node id="Conditional.xml" maxSec="300" teardown="true"> + <edge id="END" weight="1"/> + </node> + + </module>
