Permalink
Browse files

- removed some remaining bits of grouped_node

  • Loading branch information...
1 parent cbdfbda commit 8098c33bd5a24fcf2e2de1fc54620178e6304bcd kruber@zib.de committed Aug 9, 2011
Showing with 7 additions and 41 deletions.
  1. +1 −1 Emakefile.in
  2. +4 −4 Makefile.in
  3. +0 −26 bin/groupnode.sh
  4. +1 −9 bin/scalaris.cfg
  5. +1 −1 bin/scalarisctl.in
View
@@ -8,7 +8,7 @@
@EMAKEFILEDEFINES@
]}.
% now the source and all of its sub-directories:
-{["src/*", "src/comm_layer/*", "src/grouped_node/*", "src/paxos/*", "src/pubsub/*", "src/simulation/*", "src/transactions/*", "src/grouped_node/rsm/*", "src/rrepair/*"],
+{["src/*", "src/comm_layer/*", "src/paxos/*", "src/pubsub/*", "src/simulation/*", "src/transactions/*", "src/rrepair/*"],
[debug_info, warn_unused_import, warn_missing_spec, warn_exported_vars, warn_untyped_record,
{outdir, "ebin"},
{i, "ebin"},
View
@@ -411,16 +411,16 @@ doc: .make-doc
docs: doc java-doc
svn:
- $(SVN) propset svn:keywords Id src/*.erl src/*/*.erl src/*/*/*.erl test/*.erl bin/*.cfg
+ $(SVN) propset svn:keywords Id src/*.erl src/*/*.erl test/*.erl bin/*.cfg
dialyzer: compile
- $(DIALYZER) @DIALYZER_FLAGS@ -Werror_handling -Wrace_conditions -Wunmatched_returns -I include/ -I contrib/yaws/include/ -I contrib/log4erl/include/ --src -c src src/*/ src/*/*/ test/unittest_helper.erl test/tester*.erl test/mockup*.erl test/erl_id_trans.erl test/measure_util.erl --no_native | sed -f contrib/dialyzer-col.sed
+ $(DIALYZER) @DIALYZER_FLAGS@ -Werror_handling -Wrace_conditions -Wunmatched_returns -I include/ -I contrib/yaws/include/ -I contrib/log4erl/include/ --src -c src src/*/ test/unittest_helper.erl test/tester*.erl test/mockup*.erl test/erl_id_trans.erl test/measure_util.erl --no_native | sed -f contrib/dialyzer-col.sed
dialyzer-all: compile
- $(DIALYZER) @DIALYZER_FLAGS@ -Werror_handling -Wrace_conditions -Wunmatched_returns -Wno_return -Wno_opaque -I include/ -I contrib/yaws/include/ -I contrib/log4erl/include/ --src -c src src/*/ src/*/*/ test | sed -f contrib/dialyzer-col.sed
+ $(DIALYZER) @DIALYZER_FLAGS@ -Werror_handling -Wrace_conditions -Wunmatched_returns -Wno_return -Wno_opaque -I include/ -I contrib/yaws/include/ -I contrib/log4erl/include/ --src -c src src/*/ test | sed -f contrib/dialyzer-col.sed
%_SUITE-dialyzer: compile
- $(DIALYZER) @DIALYZER_FLAGS@ -Werror_handling -Wrace_conditions -Wunmatched_returns -Wno_return -Wno_opaque -I include/ -I contrib/yaws/include/ -I contrib/log4erl/include/ --src -c src src/*/ src/*/*/ test/unittest_helper.erl test/tester*.erl test/erl_id_trans.erl test/measure_util.erl test/$*_SUITE.erl --no_native | sed -f contrib/dialyzer-col.sed
+ $(DIALYZER) @DIALYZER_FLAGS@ -Werror_handling -Wrace_conditions -Wunmatched_returns -Wno_return -Wno_opaque -I include/ -I contrib/yaws/include/ -I contrib/log4erl/include/ --src -c src src/*/ test/unittest_helper.erl test/tester*.erl test/erl_id_trans.erl test/measure_util.erl test/$*_SUITE.erl --no_native | sed -f contrib/dialyzer-col.sed
plt: compile
$(DIALYZER) --plt_info > /dev/null ; \
View
@@ -1,26 +0,0 @@
-#!/bin/bash
-# Copyright 2007-2011 Zuse Institute Berlin
-#
-# Licensed 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.
-
-# Script to start a new Scalaris system with an initial, grouped node
-# (experimental).
-ID=0
-NAME="firstnode"
-CSPORT=$((14195+$ID))
-YAWSPORT=$((8000+$ID))
-
-ABSPATH="$(cd "${0%/*}" 2>/dev/null; echo "$PWD"/"${0##*/}")"
-DIRNAME=`dirname $ABSPATH`
-
-$DIRNAME/scalarisctl -f -n $NAME -p $CSPORT -y $YAWSPORT -g start $*
View
@@ -276,15 +276,7 @@
%{known_hosts, [{service_per_vm, 'firstnode@csr-pc11.zib.de'}, {service_per_vm, 'node1@csr-pc11.zib.de'}]}.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% grouped_node
+%% dht_node processes
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
{dht_node_sup, sup_dht_node}.
{dht_node, dht_node}.
-%{dht_node_sup, sup_group_node}.
-%{dht_node, group_node}.
-{group_node_trigger, trigger_periodic}.
-{group_node_base_interval, 30000}.
-{group_max_size, 10}.
-{group_repair_chunk_size, 100}.
-{group_delete_chunk_size, 100}.
-{group_repair_timeout, 30000}.
View
@@ -70,7 +70,7 @@ usage(){
echo " commands:"
echo " checkinstallation"
echo " - test installation"
- echo " start - start services (see -m, and -s)"
+ echo " start - start services (see -m and -s)"
echo " stop - stop a scalaris process defined by its name (see -n)"
echo " restart - restart a scalaris process by its name (see -n)"
echo ""

0 comments on commit 8098c33

Please sign in to comment.