From: <ta...@us...> - 2013-06-19 14:04:43
|
Revision: 8299 http://gfarm.svn.sourceforge.net/gfarm/?rev=8299&view=rev Author: tatebe Date: 2013-06-19 14:04:35 +0000 (Wed, 19 Jun 2013) Log Message: ----------- merge r8057, r8058 and r8294 from the 2.5 branch - add status function (for debian) - service gfmd kill Revision Links: -------------- http://gfarm.svn.sourceforge.net/gfarm/?rev=8057&view=rev http://gfarm.svn.sourceforge.net/gfarm/?rev=8058&view=rev http://gfarm.svn.sourceforge.net/gfarm/?rev=8294&view=rev Modified Paths: -------------- gfarm_v2/branches/2.6/gftool/config-gfarm/sysdep/default/gfmd.in gfarm_v2/branches/2.6/gftool/config-gfarm/sysdep/freebsd/gfmd.in gfarm_v2/branches/2.6/gftool/config-gfarm/sysdep/linux/debian/gfmd.in gfarm_v2/branches/2.6/gftool/config-gfarm/sysdep/linux/debian/gfsd.in gfarm_v2/branches/2.6/gftool/config-gfarm/sysdep/linux/redhat/gfmd.in gfarm_v2/branches/2.6/gftool/config-gfarm/sysdep/linux/suse/gfmd.in gfarm_v2/branches/2.6/gftool/config-gfarm/sysdep/netbsd/gfmd.in Property Changed: ---------------- gfarm_v2/branches/2.6/ gfarm_v2/branches/2.6/gftool/gfdump/ gfarm_v2/branches/2.6/gftool/gfdump/gfdump.postgresql.in gfarm_v2/branches/2.6/gftool/gfgroup/gfgroup.c gfarm_v2/branches/2.6/lib/libgfarm/gfarm/ gfarm_v2/branches/2.6/server/gfmd/ Property changes on: gfarm_v2/branches/2.6 ___________________________________________________________________ Modified: svn:mergeinfo - /gfarm_v2/branches/2.4:5271,5275-5281,5290,5329 /gfarm_v2/branches/2.5:7217,7509,7560-7561,7564,7633,7650,7655,7680,7700,7725,7728,7732,7736,7780,7796,7813,7852,7855,7897,7918,7922,7924,7929,7933,7941-7942,7954,7983,7997,8005,8008,8011,8014,8017,8028,8040,8043,8050,8053,8072,8078,8083,8095,8097,8149,8154,8163,8180-8181,8189,8227,8232,8236,8241,8245,8280 /gfarm_v2/branches/2.5.7:6801,6804,6989,6998-6999 /gfarm_v2/trunk:5598-5599,5616-5624,5626-5628,5641-5647,5650,5653,5657-5666,5669-5670,5673-5674,5683-5685,5693,5695-5696,5699,5704-5711,5717,5719-5720,5726-5727,5729-5730,5739,5746-5751,5775,5793,5799,5806,5808-5809,5815-5818,5821,5825,5827-5831,5839-5842,5844-5849,5851,5863-5864,5868,5870,5872-5878,5881,5884-5886,5889,5897,5913,5915,5924,5928,5930,5932,5934,5937,5942-5948,5959,5966-5972,5974-5975,5980,5994,5997-5998,6001-6007,6012-6013,6016,6019-6022,6024-6029,6031-6032,6034,6040,6042-6047,6053,6062-6063,6065,6070,6073,6077-6079,6081,6083-6084,6086,6089,6091,6093,6095,6101,6103,6107-6108,6111,6116-6118,6120,6122,6129,6131-6137,6139,6141-6142,6144-6150,6152-6157,6159,6161,6166,6168,6173,6175,6177-6179,6181-6185,6188,6190-6193,6196,6214,6217-6218,6220-6223,6230-6232,6238-6239,6242,6247-6248,6250,6252,6255,6257-6258,6263,6265,6268,6271-6273,6276-6278,6282,6286-6287,6289,6292-6296,6298,6304-6306,6309-6310,6314-6315,6331-6333,6335,6340,6354,6361,6377,6380,6394-6397,6406,6413-6414,6420,6423-6427,6437,6448,6451-6452,6455,6458-6459,6469-6470,6476,6486,6553,6567,6571,6575,6577,6580-6581,6604,6614,6616,6630,6638,6645,6700,6741,6747,6754,6756,6758,6762,6764,6766,6768,6770,6778,6807,6810,6815,6823,6825,6836-6837,6839,6852,6854,6856,6865,6879,6926,6928,6939,6945-6946,6948-6952,6956,7008,7012,7015,7097,7099,7101,7103,7122,7167,7178,7181,7185,7200,7218-7222,7228-7229,7233,7236,7239,7242,7249,7529-7530,7532,7536,7566,7578,7597,7601,7659,7664,7666,7672,7674,7686,7697,7705,7709,7713,7721,7747,7751,7755,7758,7762-7763,7768,7775,7788,7798-7799,7801,7806,7827,7831,7836,7842,7847,7866,7878,7881,7884,7888,7892,7914,7916,7936,7967,7971,7979,7993,8001,8020,8024,8029,8046,8048,8141,8158,8240,8255 + /gfarm_v2/branches/2.4:5271,5275-5281,5290,5329 /gfarm_v2/branches/2.5:7217,7509,7560-7561,7564,7633,7650,7655,7680,7700,7725,7728,7732,7736,7780,7796,7813,7852,7855,7897,7918,7922,7924,7929,7933,7941-7942,7954,7983,7997,8005,8008,8011,8014,8017,8028,8040,8043,8050,8053,8057-8058,8072,8078,8083,8095,8097,8149,8154,8163,8180-8181,8189,8227,8232,8236,8241,8245,8280,8294 /gfarm_v2/branches/2.5.7:6801,6804,6989,6998-6999 /gfarm_v2/trunk:5598-5599,5616-5624,5626-5628,5641-5647,5650,5653,5657-5666,5669-5670,5673-5674,5683-5685,5693,5695-5696,5699,5704-5711,5717,5719-5720,5726-5727,5729-5730,5739,5746-5751,5775,5793,5799,5806,5808-5809,5815-5818,5821,5825,5827-5831,5839-5842,5844-5849,5851,5863-5864,5868,5870,5872-5878,5881,5884-5886,5889,5897,5913,5915,5924,5928,5930,5932,5934,5937,5942-5948,5959,5966-5972,5974-5975,5980,5994,5997-5998,6001-6007,6012-6013,6016,6019-6022,6024-6029,6031-6032,6034,6040,6042-6047,6053,6062-6063,6065,6070,6073,6077-6079,6081,6083-6084,6086,6089,6091,6093,6095,6101,6103,6107-6108,6111,6116-6118,6120,6122,6129,6131-6137,6139,6141-6142,6144-6150,6152-6157,6159,6161,6166,6168,6173,6175,6177-6179,6181-6185,6188,6190-6193,6196,6214,6217-6218,6220-6223,6230-6232,6238-6239,6242,6247-6248,6250,6252,6255,6257-6258,6263,6265,6268,6271-6273,6276-6278,6282,6286-6287,6289,6292-6296,6298,6304-6306,6309-6310,6314-6315,6331-6333,6335,6340,6354,6361,6377,6380,6394-6397,6406,6413-6414,6420,6423-6427,6437,6448,6451-6452,6455,6458-6459,6469-6470,6476,6486,6553,6567,6571,6575,6577,6580-6581,6604,6614,6616,6630,6638,6645,6700,6741,6747,6754,6756,6758,6762,6764,6766,6768,6770,6778,6807,6810,6815,6823,6825,6836-6837,6839,6852,6854,6856,6865,6879,6926,6928,6939,6945-6946,6948-6952,6956,7008,7012,7015,7097,7099,7101,7103,7122,7167,7178,7181,7185,7200,7218-7222,7228-7229,7233,7236,7239,7242,7249,7529-7530,7532,7536,7566,7578,7597,7601,7659,7664,7666,7672,7674,7686,7697,7705,7709,7713,7721,7747,7751,7755,7758,7762-7763,7768,7775,7788,7798-7799,7801,7806,7827,7831,7836,7842,7847,7866,7878,7881,7884,7888,7892,7914,7916,7936,7967,7971,7979,7993,8001,8020,8024,8029,8046,8048,8141,8158,8240,8255 Modified: gfarm_v2/branches/2.6/gftool/config-gfarm/sysdep/default/gfmd.in =================================================================== --- gfarm_v2/branches/2.6/gftool/config-gfarm/sysdep/default/gfmd.in 2013-06-19 13:47:42 UTC (rev 8298) +++ gfarm_v2/branches/2.6/gftool/config-gfarm/sysdep/default/gfmd.in 2013-06-19 14:04:35 UTC (rev 8299) @@ -47,10 +47,12 @@ $DAEMON -P "$PIDFILE" $OPTIONS ;; -stop) +stop|kill) + SIGNAL=TERM + [ $1 = kill ] && SIGNAL=KILL if [ -f "$PIDFILE" ]; then pid=`cat "$PIDFILE"` - if kill -TERM $pid; then + if kill -$SIGNAL $pid; then while kill -0 $pid 2>/dev/null; do echo "old $FILE (pid $pid) is still running, sleeping..." logger -p ${warning_facility}.${warning_priority} "old $FILE (pid $pid) is still running, sleeping..." @@ -85,7 +87,7 @@ ;; *) - echo "Usage: $0 { start | stop | restart | status }" + echo "Usage: $0 {start|slavestart|stop|kill|restart|status}" exit 1 ;; esac Modified: gfarm_v2/branches/2.6/gftool/config-gfarm/sysdep/freebsd/gfmd.in =================================================================== --- gfarm_v2/branches/2.6/gftool/config-gfarm/sysdep/freebsd/gfmd.in 2013-06-19 13:47:42 UTC (rev 8298) +++ gfarm_v2/branches/2.6/gftool/config-gfarm/sysdep/freebsd/gfmd.in 2013-06-19 14:04:35 UTC (rev 8299) @@ -48,13 +48,19 @@ . "$GLOBUS_LOCATION/etc/globus-user-env.sh" fi -case $1 in - slavestart) +CMD=$1 +case X$CMD in + Xslavestart) OPTIONS="-S $OPTIONS" + CMD=start ;; + Xkill) + sig_stop=SIGKILL + CMD=stop + ;; esac # add more flags through ${${name}_flags} command_args="-P $pidfile $OPTIONS" -run_rc_command "$1" +run_rc_command "$CMD" Modified: gfarm_v2/branches/2.6/gftool/config-gfarm/sysdep/linux/debian/gfmd.in =================================================================== --- gfarm_v2/branches/2.6/gftool/config-gfarm/sysdep/linux/debian/gfmd.in 2013-06-19 13:47:42 UTC (rev 8298) +++ gfarm_v2/branches/2.6/gftool/config-gfarm/sysdep/linux/debian/gfmd.in 2013-06-19 14:04:35 UTC (rev 8299) @@ -18,6 +18,9 @@ test -f $DAEMON || exit 0 test -f $CONF || exit 0 +# status_of_proc +. /lib/lsb/init-functions + case "$1" in start) echo -n "Starting gfarm server: $FILE" @@ -37,12 +40,21 @@ --retry TERM/forever/-0/1 --exec $DAEMON echo "." ;; + kill) + echo -n "Stopping gfarm server: $FILE" + start-stop-daemon --stop --quiet --pidfile $PIDFILE \ + --retry TERM/5/KILL/1 --exec $DAEMON + echo "." + ;; + status) + status_of_proc -p $PIDFILE $DAEMON $NAME && exit 0 || exit $? + ;; restart|force-reload) $0 stop $0 start ;; *) - echo "Usage: /etc/init.d/$FILE {start|stop|restart}" + echo "Usage: /etc/init.d/$FILE {start|slavestart|stop|kill|status|restart|force-reload}" exit 1 ;; esac Modified: gfarm_v2/branches/2.6/gftool/config-gfarm/sysdep/linux/debian/gfsd.in =================================================================== --- gfarm_v2/branches/2.6/gftool/config-gfarm/sysdep/linux/debian/gfsd.in 2013-06-19 13:47:42 UTC (rev 8298) +++ gfarm_v2/branches/2.6/gftool/config-gfarm/sysdep/linux/debian/gfsd.in 2013-06-19 14:04:35 UTC (rev 8299) @@ -22,6 +22,9 @@ test -f $DAEMON || exit 0 test -f $CONF || exit 0 +# status_of_proc +. /lib/lsb/init-functions + case "$1" in start) echo -n "Starting gfarm server: $FILE" @@ -34,12 +37,15 @@ start-stop-daemon --stop --quiet --pidfile $PIDFILE --exec $DAEMON echo "." ;; + status) + status_of_proc -p $PIDFILE $DAEMON $NAME && exit 0 || exit $? + ;; restart|force-reload) $0 stop $0 start ;; *) - echo "Usage: $0 {start|stop|restart}" + echo "Usage: $0 {start|stop|status|restart}" exit 1 ;; esac Modified: gfarm_v2/branches/2.6/gftool/config-gfarm/sysdep/linux/redhat/gfmd.in =================================================================== --- gfarm_v2/branches/2.6/gftool/config-gfarm/sysdep/linux/redhat/gfmd.in 2013-06-19 13:47:42 UTC (rev 8298) +++ gfarm_v2/branches/2.6/gftool/config-gfarm/sysdep/linux/redhat/gfmd.in 2013-06-19 14:04:35 UTC (rev 8299) @@ -60,6 +60,8 @@ stop() { + SIGNAL=$1 + [ X$SIGNAL = X ] && SIGNAL=TERM echo -n "Stopping $FILE:" checkstatus > /dev/null if [ $? -eq 3 ]; then @@ -70,7 +72,7 @@ if [ -f "$PIDFILE" ]; then pid=`cat "$PIDFILE"` - kill -TERM $pid && success || failure + kill -$SIGNAL $pid && success || failure RETVAL=$? if [ $RETVAL -eq 0 ]; then while kill -0 $pid 2>/dev/null; do @@ -112,7 +114,7 @@ usage() { - echo $"Usage: $0 {start|stop|restart|status}" + echo $"Usage: $0 {start|slavestart|stop|kill|restart|reload|status}" exit 1 } @@ -135,6 +137,10 @@ stop RETVAL=$? ;; + kill) + stop KILL + RETVAL=$? + ;; restart|reload) stop start Modified: gfarm_v2/branches/2.6/gftool/config-gfarm/sysdep/linux/suse/gfmd.in =================================================================== --- gfarm_v2/branches/2.6/gftool/config-gfarm/sysdep/linux/suse/gfmd.in 2013-06-19 13:47:42 UTC (rev 8298) +++ gfarm_v2/branches/2.6/gftool/config-gfarm/sysdep/linux/suse/gfmd.in 2013-06-19 14:04:35 UTC (rev 8299) @@ -51,11 +51,13 @@ fi rc_status -v ;; - stop) + stop|kill) echo -n "Shutting down $FILE" + SIGNAL=TERM + [ $1 = kill ] && SIGNAL=KILL if [ -f "$PIDFILE" ]; then pid=`cat "$PIDFILE"` - if kill -TERM $pid; then + if kill -$SIGNAL $pid; then while kill -0 $pid 2>/dev/null; do echo "old $FILE (pid $pid) is still running, sleeping..." logger -p ${warning_facility}.${warning_priority} "old $FILE (pid $pid) is still running, sleeping..." @@ -108,7 +110,7 @@ rc_status -v ;; *) - echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload}" + echo "Usage: $0 {start|slavestart|stop|kill|status|try-restart|restart|force-reload|reload}" exit 1 ;; esac Modified: gfarm_v2/branches/2.6/gftool/config-gfarm/sysdep/netbsd/gfmd.in =================================================================== --- gfarm_v2/branches/2.6/gftool/config-gfarm/sysdep/netbsd/gfmd.in 2013-06-19 13:47:42 UTC (rev 8298) +++ gfarm_v2/branches/2.6/gftool/config-gfarm/sysdep/netbsd/gfmd.in 2013-06-19 14:04:35 UTC (rev 8299) @@ -21,10 +21,16 @@ pidfile="@config_gfarm_gfmd_pid_file@" required_files="$CONF" -case $1 in - slavestart) +CMD=$1 +case X$CMD in + Xslavestart) OPTIONS="-S $OPTIONS" + CMD=start ;; + Xkill) + sig_stop=SIGKILL + CMD=stop + ;; esac # add more flags through ${${name}_flags} @@ -32,7 +38,7 @@ if [ -f /etc/rc.subr ]; then load_rc_config ${FILE} - run_rc_command "$1" + run_rc_command "$CMD" else echo -n " ${name}" ${command} ${gfmd_flags} ${command_args} Property changes on: gfarm_v2/branches/2.6/gftool/gfdump ___________________________________________________________________ Modified: svn:mergeinfo - /gfarm_v2/branches/2.4/gftool/gfdump:5271,5275-5281,5290,5329 /gfarm_v2/branches/2.5/gftool/gfdump:7217,7509,7560-7561,7564,7633,7650,7655,7680,7725,7728,7732,7736,7780,7796,7813,7852,7855,7897,7918,7922,7924,7929,7933,7941-7942,7954,7983,7997,8005,8008,8011,8014,8017,8028,8040,8043,8050,8053,8072,8078,8083,8095,8097,8149,8154,8163,8180-8181,8189,8227,8232,8236,8241,8245,8280 /gfarm_v2/branches/2.5.7/gftool/gfdump:6801,6804,6989,6998-6999 /gfarm_v2/trunk/gftool/gfdump:5598-5599,5616-5624,5626-5628,5641-5647,5650,5653,5657-5666,5669-5670,5673-5674,5683-5685,5693,5695-5696,5699,5704-5711,5717,5719-5720,5726-5727,5729-5730,5739,5746-5751,5775,5793,5799,5806,5808-5809,5815-5817,5821,5825,5827-5831,5839-5842,5844-5849,5851,5863-5864,5868,5870,5872-5878,5881,5884-5886,5889,5897,5913,5915,5924,5928,5930,5932,5934,5937,5942-5948,5959,5966-5972,5974-5975,5980,5994,5997-5998,6001-6007,6012-6013,6016,6019-6022,6024-6029,6031-6032,6034,6040,6042-6047,6053,6063,6070,6073,6077-6079,6081,6083-6084,6086,6089,6091,6093,6095,6101,6103,6107-6108,6111,6116-6118,6120,6122,6129,6131-6137,6139,6141-6142,6144-6150,6152-6157,6159,6161,6166,6168,6173,6175,6177-6179,6181-6185,6188,6190-6193,6196,6214,6217-6218,6220-6223,6230-6232,6238-6239,6242,6247-6248,6250,6252,6255,6257-6258,6263,6265,6268,6271-6273,6276-6278,6282,6286-6287,6289,6292-6296,6298,6304-6306,6309-6310,6314-6315,6331-6333,6335,6340,6354,6361,6377,6380,6394-6397,6406,6413-6414,6420,6423-6427,6437,6448,6451-6452,6455,6458-6459,6469-6470,6476,6486,6491,6553,6575,6638,6645,6700,6778,6815,6836,6852,6865,7008,7015,7122,7167,7181,7228,7242,7249,7529,7566,7659,7755,7758,7762-7763,7768,7806,7827,7847,7866,7914,7936,7967,8020,8024,8029,8046,8048,8141,8158,8240,8255 + /gfarm_v2/branches/2.4/gftool/gfdump:5271,5275-5281,5290,5329 /gfarm_v2/branches/2.5/gftool/gfdump:7217,7509,7560-7561,7564,7633,7650,7655,7680,7725,7728,7732,7736,7780,7796,7813,7852,7855,7897,7918,7922,7924,7929,7933,7941-7942,7954,7983,7997,8005,8008,8011,8014,8017,8028,8040,8043,8050,8053,8057-8058,8072,8078,8083,8095,8097,8149,8154,8163,8180-8181,8189,8227,8232,8236,8241,8245,8280,8294 /gfarm_v2/branches/2.5.7/gftool/gfdump:6801,6804,6989,6998-6999 /gfarm_v2/trunk/gftool/gfdump:5598-5599,5616-5624,5626-5628,5641-5647,5650,5653,5657-5666,5669-5670,5673-5674,5683-5685,5693,5695-5696,5699,5704-5711,5717,5719-5720,5726-5727,5729-5730,5739,5746-5751,5775,5793,5799,5806,5808-5809,5815-5817,5821,5825,5827-5831,5839-5842,5844-5849,5851,5863-5864,5868,5870,5872-5878,5881,5884-5886,5889,5897,5913,5915,5924,5928,5930,5932,5934,5937,5942-5948,5959,5966-5972,5974-5975,5980,5994,5997-5998,6001-6007,6012-6013,6016,6019-6022,6024-6029,6031-6032,6034,6040,6042-6047,6053,6063,6070,6073,6077-6079,6081,6083-6084,6086,6089,6091,6093,6095,6101,6103,6107-6108,6111,6116-6118,6120,6122,6129,6131-6137,6139,6141-6142,6144-6150,6152-6157,6159,6161,6166,6168,6173,6175,6177-6179,6181-6185,6188,6190-6193,6196,6214,6217-6218,6220-6223,6230-6232,6238-6239,6242,6247-6248,6250,6252,6255,6257-6258,6263,6265,6268,6271-6273,6276-6278,6282,6286-6287,6289,6292-6296,6298,6304-6306,6309-6310,6314-6315,6331-6333,6335,6340,6354,6361,6377,6380,6394-6397,6406,6413-6414,6420,6423-6427,6437,6448,6451-6452,6455,6458-6459,6469-6470,6476,6486,6491,6553,6575,6638,6645,6700,6778,6815,6836,6852,6865,7008,7015,7122,7167,7181,7228,7242,7249,7529,7566,7659,7755,7758,7762-7763,7768,7806,7827,7847,7866,7914,7936,7967,8020,8024,8029,8046,8048,8141,8158,8240,8255 Property changes on: gfarm_v2/branches/2.6/gftool/gfdump/gfdump.postgresql.in ___________________________________________________________________ Modified: svn:mergeinfo - /gfarm_v2/branches/2.5/gftool/gfdump/gfdump.postgresql.in:7217,7509,7560-7561,7564,7633,7650,7655,7680,7725,7728,7732,7736,7780,7796,7813,7852,7855,7897,7918,7922,7924,7929,7933,7941-7942,7954,7983,7997,8005,8008,8011,8014,8017,8028,8040,8043,8050,8053,8072,8078,8083,8095,8097,8149,8154,8163,8180-8181,8189,8227,8232,8236,8241,8245,8280 /gfarm_v2/branches/2.5.7/gftool/gfdump/gfdump.postgresql.in:6801,6804,6989,6998-6999 /gfarm_v2/trunk/gftool/gfdump/gfdump.postgresql.in:5599,5626,5669,5673,5704-5711,5717,5726,5739,5746-5751,5806,5815-5817,5851,5872-5873,5881,5884-5885,5897,5928,5930,5937,5942-5948,5966-5972,5974-5975,5980,5994,5997-5998,6004-6007,6020-6022,6024,6028,6031-6032,6034,6042-6047,6053,6063,6107-6108,6111,6116-6117,6122,6131-6136,6141-6142,6144-6150,6154,6156-6157,6177,6181-6183,6190-6193,6196,6214,6217-6218,6220-6223,6230-6232,6238-6239,6242,6247-6248,6250,6252,6255,6257-6258,6263,6265,6271,6273,6276-6278,6282,6286-6287,6289,6292-6294,6296,6298,6304,6309,6314,6331-6332,6340,6361,6377,6380,6394-6396,6406,6413-6414,6420,6423-6426,6448,6451,6455,6476,6486,6491,6553,6575,6638,6645,6700,6778,6815,6836,6852,6865,7008,7015,7122,7167,7181,7228,7242,7249,7529,7566,7659,7755,7758,7762-7763,7768,7806,7827,7847,7866,7914,7936,7967,8020,8024,8029,8046,8048,8141,8158,8240,8255 + /gfarm_v2/branches/2.5/gftool/gfdump/gfdump.postgresql.in:7217,7509,7560-7561,7564,7633,7650,7655,7680,7725,7728,7732,7736,7780,7796,7813,7852,7855,7897,7918,7922,7924,7929,7933,7941-7942,7954,7983,7997,8005,8008,8011,8014,8017,8028,8040,8043,8050,8053,8057-8058,8072,8078,8083,8095,8097,8149,8154,8163,8180-8181,8189,8227,8232,8236,8241,8245,8280,8294 /gfarm_v2/branches/2.5.7/gftool/gfdump/gfdump.postgresql.in:6801,6804,6989,6998-6999 /gfarm_v2/trunk/gftool/gfdump/gfdump.postgresql.in:5599,5626,5669,5673,5704-5711,5717,5726,5739,5746-5751,5806,5815-5817,5851,5872-5873,5881,5884-5885,5897,5928,5930,5937,5942-5948,5966-5972,5974-5975,5980,5994,5997-5998,6004-6007,6020-6022,6024,6028,6031-6032,6034,6042-6047,6053,6063,6107-6108,6111,6116-6117,6122,6131-6136,6141-6142,6144-6150,6154,6156-6157,6177,6181-6183,6190-6193,6196,6214,6217-6218,6220-6223,6230-6232,6238-6239,6242,6247-6248,6250,6252,6255,6257-6258,6263,6265,6271,6273,6276-6278,6282,6286-6287,6289,6292-6294,6296,6298,6304,6309,6314,6331-6332,6340,6361,6377,6380,6394-6396,6406,6413-6414,6420,6423-6426,6448,6451,6455,6476,6486,6491,6553,6575,6638,6645,6700,6778,6815,6836,6852,6865,7008,7015,7122,7167,7181,7228,7242,7249,7529,7566,7659,7755,7758,7762-7763,7768,7806,7827,7847,7866,7914,7936,7967,8020,8024,8029,8046,8048,8141,8158,8240,8255 Property changes on: gfarm_v2/branches/2.6/gftool/gfgroup/gfgroup.c ___________________________________________________________________ Modified: svn:mergeinfo - /gfarm_v2/branches/2.4/gftool/gfgroup/gfgroup.c:5271,5275-5281,5290,5329,5335 /gfarm_v2/branches/2.5/gftool/gfgroup/gfgroup.c:7217,7509,7560-7561,7564,7633,7650,7655,7680,7725,7728,7732,7736,7780,7796,7813,7852,7855,7897,7918,7922,7924,7929,7933,7941-7942,7954,7983,7997,8005,8008,8011,8014,8017,8028,8040,8043,8050,8053,8072,8078,8083,8095,8097,8149,8154,8163,8180-8181,8189,8227,8232,8236,8241,8245,8280 /gfarm_v2/branches/2.5.7/gftool/gfgroup/gfgroup.c:6801,6804,6989,6998-6999 /gfarm_v2/trunk/gftool/gfgroup/gfgroup.c:5598-5599,5616-5624,5626-5628,5641-5647,5650,5653,5657-5666,5669-5670,5673-5674,5683-5685,5693,5695-5696,5699,5704-5711,5717,5719-5720,5726-5727,5729-5730,5739,5746-5751,5775,5793,5799,5806,5808-5809,5815-5817,5821,5827-5831,5839-5842,5844-5849,5851,5863-5864,5868,5870,5872-5878,5881,5884-5886,5889,5897,5913,5915,5924,5928,5930,5932,5934,5937,5942-5948,5959,5966-5972,5974-5975,5980,5994,5997-5998,6001-6007,6012-6013,6016,6019-6022,6024-6029,6031-6032,6034,6040,6042-6047,6053,6062-6063,6065,6073,6078,6091,6093,6107-6108,6111,6116-6118,6122,6131-6137,6141-6142,6144-6150,6152-6157,6159,6161,6166,6168,6173,6175,6177-6179,6181-6185,6188,6190-6193,6196,6214,6217-6218,6220-6223,6230-6232,6238-6239,6242,6247-6248,6250,6252,6255,6257-6258,6263,6265,6268,6271-6273,6276-6278,6282,6286-6287,6289,6292-6296,6298,6304-6306,6309-6310,6314-6315,6331-6333,6335,6340,6354,6361,6377,6380,6394-6397,6406,6413-6414,6420,6423-6427,6437,6448,6451-6452,6455,6458-6459,6469-6470,6476,6486,6553,6575,6638,6645,6700,6778,6815,6836,6852,6865,7008,7015,7122,7167,7181,7228,7242,7249,7529,7566,7659,7755,7758,7762-7763,7768,7806,7827,7847,7866,7914,7936,7967,8020,8024,8029,8046,8048,8141,8158,8240,8255 + /gfarm_v2/branches/2.4/gftool/gfgroup/gfgroup.c:5271,5275-5281,5290,5329,5335 /gfarm_v2/branches/2.5/gftool/gfgroup/gfgroup.c:7217,7509,7560-7561,7564,7633,7650,7655,7680,7725,7728,7732,7736,7780,7796,7813,7852,7855,7897,7918,7922,7924,7929,7933,7941-7942,7954,7983,7997,8005,8008,8011,8014,8017,8028,8040,8043,8050,8053,8057-8058,8072,8078,8083,8095,8097,8149,8154,8163,8180-8181,8189,8227,8232,8236,8241,8245,8280,8294 /gfarm_v2/branches/2.5.7/gftool/gfgroup/gfgroup.c:6801,6804,6989,6998-6999 /gfarm_v2/trunk/gftool/gfgroup/gfgroup.c:5598-5599,5616-5624,5626-5628,5641-5647,5650,5653,5657-5666,5669-5670,5673-5674,5683-5685,5693,5695-5696,5699,5704-5711,5717,5719-5720,5726-5727,5729-5730,5739,5746-5751,5775,5793,5799,5806,5808-5809,5815-5817,5821,5827-5831,5839-5842,5844-5849,5851,5863-5864,5868,5870,5872-5878,5881,5884-5886,5889,5897,5913,5915,5924,5928,5930,5932,5934,5937,5942-5948,5959,5966-5972,5974-5975,5980,5994,5997-5998,6001-6007,6012-6013,6016,6019-6022,6024-6029,6031-6032,6034,6040,6042-6047,6053,6062-6063,6065,6073,6078,6091,6093,6107-6108,6111,6116-6118,6122,6131-6137,6141-6142,6144-6150,6152-6157,6159,6161,6166,6168,6173,6175,6177-6179,6181-6185,6188,6190-6193,6196,6214,6217-6218,6220-6223,6230-6232,6238-6239,6242,6247-6248,6250,6252,6255,6257-6258,6263,6265,6268,6271-6273,6276-6278,6282,6286-6287,6289,6292-6296,6298,6304-6306,6309-6310,6314-6315,6331-6333,6335,6340,6354,6361,6377,6380,6394-6397,6406,6413-6414,6420,6423-6427,6437,6448,6451-6452,6455,6458-6459,6469-6470,6476,6486,6553,6575,6638,6645,6700,6778,6815,6836,6852,6865,7008,7015,7122,7167,7181,7228,7242,7249,7529,7566,7659,7755,7758,7762-7763,7768,7806,7827,7847,7866,7914,7936,7967,8020,8024,8029,8046,8048,8141,8158,8240,8255 Property changes on: gfarm_v2/branches/2.6/lib/libgfarm/gfarm ___________________________________________________________________ Modified: svn:mergeinfo - /gfarm_v2/branches/2.5/lib/libgfarm/gfarm:7560,7997,8005,8008,8011,8014,8017,8028,8040,8043,8050,8053,8072,8078,8083,8095,8097,8149,8154,8163,8180-8181,8189,8227,8232,8236,8241,8245,8280 /gfarm_v2/trunk:7991 /gfarm_v2/trunk/lib/libgfarm/gfarm:7993,8001,8020,8024,8029,8046,8048,8141,8158,8240,8255 + /gfarm_v2/branches/2.5/lib/libgfarm/gfarm:7560,7997,8005,8008,8011,8014,8017,8028,8040,8043,8050,8053,8057-8058,8072,8078,8083,8095,8097,8149,8154,8163,8180-8181,8189,8227,8232,8236,8241,8245,8280,8294 /gfarm_v2/trunk:7991 /gfarm_v2/trunk/lib/libgfarm/gfarm:7993,8001,8020,8024,8029,8046,8048,8141,8158,8240,8255 Property changes on: gfarm_v2/branches/2.6/server/gfmd ___________________________________________________________________ Modified: svn:mergeinfo - /gfarm_v2/branches/2.4/server/gfmd:5271,5275-5281,5290,5329 /gfarm_v2/branches/2.5/server/gfmd:7217,7509,7560-7561,7564,7633,7650,7655,7680,7700,7725,7728,7732,7736,7780,7796,7813,7852,7855,7897,7918,7922,7924,7929,7933,7941-7942,7954,7983,7997,8005,8008,8011,8014,8017,8028,8040,8043,8050,8053,8072,8078,8083,8095,8097,8149,8154,8163,8180-8181,8189,8227,8232,8236,8241,8245,8280 /gfarm_v2/branches/2.5.7/server/gfmd:6801,6804,6989,6998-6999 /gfarm_v2/trunk/server/gfmd:5598-5599,5616-5624,5626-5628,5641-5647,5650,5653,5657-5666,5669-5670,5673-5674,5683-5685,5693,5695-5696,5699,5704-5711,5717,5719-5720,5726-5727,5729-5730,5739,5746-5751,5775,5793,5799,5806,5808-5809,5815-5818,5821,5825,5827-5831,5839-5842,5844-5849,5851,5863-5864,5868,5870,5872-5878,5881,5884-5886,5889,5897,5913,5915,5924,5928,5930,5932,5934,5937,5942-5948,5959,5966-5972,5974-5975,5980,5994,5997-5998,6001-6007,6012-6013,6016,6019-6022,6024-6029,6031-6032,6034,6040,6042-6047,6053,6062-6063,6065,6070,6073,6077-6079,6081,6083-6084,6086,6089,6091,6093,6095,6101,6103,6107-6108,6111,6116-6118,6120,6122,6129,6131-6137,6139,6141-6142,6144-6150,6152-6157,6159,6161,6166,6168,6173,6175,6177-6179,6181-6185,6188,6190-6193,6196,6214,6217-6218,6220-6223,6230-6232,6238-6239,6242,6247-6248,6250,6252,6255,6257-6258,6263,6265,6268,6271-6273,6276-6278,6282,6286-6287,6289,6292-6296,6298,6304-6306,6309-6310,6314-6315,6331-6333,6335,6340,6354,6361,6377,6380,6394-6397,6406,6413-6414,6420,6423-6427,6437,6448,6451-6452,6455,6458-6459,6469-6470,6476,6486,6553,6567,6571,6575,6577,6580-6581,6604,6614,6616,6630,6638,6645,6700,6741,6747,6754,6756,6758,6762,6764,6766,6768,6770,6778,6807,6810,6815,6823,6825,6836-6837,6839,6852,6854,6856,6865,6879,6926,6928,6939,6945-6946,6948-6952,6956,7008,7012,7015,7097,7099,7101,7103,7122,7167,7178,7181,7185,7200,7218-7222,7228-7229,7233,7236,7239,7242,7249,7529-7530,7532,7536,7566,7578,7597,7601,7659,7664,7666,7672,7674,7686,7697,7705,7709,7713,7721,7747,7751,7755,7758,7762-7763,7768,7775,7788,7798-7799,7801,7806,7827,7831,7836,7842,7847,7866,7878,7881,7884,7888,7892,7914,7916,7936,7967,7971,7979,7993,8001,8020,8024,8029,8046,8048,8141,8158,8240,8255,8270-8271 + /gfarm_v2/branches/2.4/server/gfmd:5271,5275-5281,5290,5329 /gfarm_v2/branches/2.5/server/gfmd:7217,7509,7560-7561,7564,7633,7650,7655,7680,7700,7725,7728,7732,7736,7780,7796,7813,7852,7855,7897,7918,7922,7924,7929,7933,7941-7942,7954,7983,7997,8005,8008,8011,8014,8017,8028,8040,8043,8050,8053,8057-8058,8072,8078,8083,8095,8097,8149,8154,8163,8180-8181,8189,8227,8232,8236,8241,8245,8280,8294 /gfarm_v2/branches/2.5.7/server/gfmd:6801,6804,6989,6998-6999 /gfarm_v2/trunk/server/gfmd:5598-5599,5616-5624,5626-5628,5641-5647,5650,5653,5657-5666,5669-5670,5673-5674,5683-5685,5693,5695-5696,5699,5704-5711,5717,5719-5720,5726-5727,5729-5730,5739,5746-5751,5775,5793,5799,5806,5808-5809,5815-5818,5821,5825,5827-5831,5839-5842,5844-5849,5851,5863-5864,5868,5870,5872-5878,5881,5884-5886,5889,5897,5913,5915,5924,5928,5930,5932,5934,5937,5942-5948,5959,5966-5972,5974-5975,5980,5994,5997-5998,6001-6007,6012-6013,6016,6019-6022,6024-6029,6031-6032,6034,6040,6042-6047,6053,6062-6063,6065,6070,6073,6077-6079,6081,6083-6084,6086,6089,6091,6093,6095,6101,6103,6107-6108,6111,6116-6118,6120,6122,6129,6131-6137,6139,6141-6142,6144-6150,6152-6157,6159,6161,6166,6168,6173,6175,6177-6179,6181-6185,6188,6190-6193,6196,6214,6217-6218,6220-6223,6230-6232,6238-6239,6242,6247-6248,6250,6252,6255,6257-6258,6263,6265,6268,6271-6273,6276-6278,6282,6286-6287,6289,6292-6296,6298,6304-6306,6309-6310,6314-6315,6331-6333,6335,6340,6354,6361,6377,6380,6394-6397,6406,6413-6414,6420,6423-6427,6437,6448,6451-6452,6455,6458-6459,6469-6470,6476,6486,6553,6567,6571,6575,6577,6580-6581,6604,6614,6616,6630,6638,6645,6700,6741,6747,6754,6756,6758,6762,6764,6766,6768,6770,6778,6807,6810,6815,6823,6825,6836-6837,6839,6852,6854,6856,6865,6879,6926,6928,6939,6945-6946,6948-6952,6956,7008,7012,7015,7097,7099,7101,7103,7122,7167,7178,7181,7185,7200,7218-7222,7228-7229,7233,7236,7239,7242,7249,7529-7530,7532,7536,7566,7578,7597,7601,7659,7664,7666,7672,7674,7686,7697,7705,7709,7713,7721,7747,7751,7755,7758,7762-7763,7768,7775,7788,7798-7799,7801,7806,7827,7831,7836,7842,7847,7866,7878,7881,7884,7888,7892,7914,7916,7936,7967,7971,7979,7993,8001,8020,8024,8029,8046,8048,8141,8158,8240,8255,8270-8271 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |