From: <ta...@us...> - 2013-04-22 04:50:57
|
Revision: 8116 http://gfarm.svn.sourceforge.net/gfarm/?rev=8116&view=rev Author: tatebe Date: 2013-04-22 04:50:50 +0000 (Mon, 22 Apr 2013) Log Message: ----------- merge r8115 from the 2.5.7 branch - assign log message number Revision Links: -------------- http://gfarm.svn.sourceforge.net/gfarm/?rev=8115&view=rev Modified Paths: -------------- gfarm_v2/branches/2.5/include/gfarm/gfarm_msg_enums.h gfarm_v2/branches/2.5/makes/.msgno gfarm_v2/branches/2.5/server/gfmd/fs.c gfarm_v2/branches/2.5/server/gfmd/gfmd.c gfarm_v2/branches/2.5/server/gfmd/inode.c Property Changed: ---------------- gfarm_v2/branches/2.5/ gfarm_v2/branches/2.5/gftool/gfdump/ gfarm_v2/branches/2.5/gftool/gfdump/gfdump.postgresql.in gfarm_v2/branches/2.5/gftool/gfgroup/gfgroup.c gfarm_v2/branches/2.5/lib/libgfarm/gfarm/ Property changes on: gfarm_v2/branches/2.5 ___________________________________________________________________ Modified: svn:mergeinfo - /gfarm_v2/branches/2.4:5271,5275-5281,5290,5329 /gfarm_v2/branches/2.5.7:6801,6804,6989,6998-6999,7572,7945 /gfarm_v2/branches/2.6:7201,7223,7230,7234,7237,7240,7243,7250,7419,7533,7537,7579,7598,7687,7698,7706,7710,7714,7722,7748,7752,7776,7789,7800,7802,7833,7837,7843,7879,7882,7885,7889,7893,7972,7980,7994,8002,8021,8025,8032 /gfarm_v2/trunk:5598,5616-5624,5626-5628,5641-5647,5650,5653,5657-5666,5670,5674,5683-5685,5693,5695-5696,5699,5719-5720,5727,5729-5730,5775,5793,5799,5808-5809,5818,5821,5825,5827-5831,5839-5842,5844-5849,5863-5864,5868,5870,5874-5878,5881,5886,5889,5913,5915,5924,5932,5934,5959,6001-6003,6012-6013,6016,6019,6025-6027,6029,6040,6062,6065,6070,6073,6077-6079,6081,6083-6084,6086,6089,6091,6093,6095,6101,6103,6118,6120,6129,6137,6139,6152-6153,6155,6159,6161,6166,6168,6173,6175,6178-6179,6184-6185,6188,6268,6272,6295,6305-6306,6310,6315,6333,6335,6354,6397,6427,6437,6452,6458-6459,6469-6470,6567,6571,6577,6580-6581,6604,6614,6616,6630,6645,6741,6747,6754,6756,6758,6762,6764,6766,6768,6770,6778,6807,6810,6823,6825,6837,6839,6852,6854,6856,6865,6879,6926,6928,6939,6945-6946,6948-6952,6956,7012,7097,7099,7101,7103,7178,7185,7200,7218-7222,7229,7233,7236,7239,7242,7249,7532,7536,7578,7597,7659,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,7936,7967,7971,7979,7993,8001,8020,8024,8029 + /gfarm_v2/branches/2.4:5271,5275-5281,5290,5329 /gfarm_v2/branches/2.5.7:6801,6804,6989,6998-6999,7572,7945,8115 /gfarm_v2/branches/2.6:7201,7223,7230,7234,7237,7240,7243,7250,7419,7533,7537,7579,7598,7687,7698,7706,7710,7714,7722,7748,7752,7776,7789,7800,7802,7833,7837,7843,7879,7882,7885,7889,7893,7972,7980,7994,8002,8021,8025,8032 /gfarm_v2/trunk:5598,5616-5624,5626-5628,5641-5647,5650,5653,5657-5666,5670,5674,5683-5685,5693,5695-5696,5699,5719-5720,5727,5729-5730,5775,5793,5799,5808-5809,5818,5821,5825,5827-5831,5839-5842,5844-5849,5863-5864,5868,5870,5874-5878,5881,5886,5889,5913,5915,5924,5932,5934,5959,6001-6003,6012-6013,6016,6019,6025-6027,6029,6040,6062,6065,6070,6073,6077-6079,6081,6083-6084,6086,6089,6091,6093,6095,6101,6103,6118,6120,6129,6137,6139,6152-6153,6155,6159,6161,6166,6168,6173,6175,6178-6179,6184-6185,6188,6268,6272,6295,6305-6306,6310,6315,6333,6335,6354,6397,6427,6437,6452,6458-6459,6469-6470,6567,6571,6577,6580-6581,6604,6614,6616,6630,6645,6741,6747,6754,6756,6758,6762,6764,6766,6768,6770,6778,6807,6810,6823,6825,6837,6839,6852,6854,6856,6865,6879,6926,6928,6939,6945-6946,6948-6952,6956,7012,7097,7099,7101,7103,7178,7185,7200,7218-7222,7229,7233,7236,7239,7242,7249,7532,7536,7578,7597,7659,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,7936,7967,7971,7979,7993,8001,8020,8024,8029 Property changes on: gfarm_v2/branches/2.5/gftool/gfdump ___________________________________________________________________ Modified: svn:mergeinfo - /gfarm_v2/branches/2.4/gftool/gfdump:5271,5275-5281,5290,5329 /gfarm_v2/branches/2.5.7/gftool/gfdump:6801,6804,6989,6998-6999,7572,7945 /gfarm_v2/branches/2.6/gftool/gfdump:7243,7250,7419,8021,8025,8032 /gfarm_v2/trunk/gftool/gfdump:5598,5616-5624,5626-5628,5641-5647,5650,5653,5657-5666,5670,5674,5683-5685,5693,5695-5696,5699,5719-5720,5727,5729-5730,5775,5793,5799,5808-5809,5821,5825,5827-5831,5839-5842,5844-5849,5863-5864,5868,5870,5874-5878,5881,5886,5889,5913,5915,5924,5932,5934,5959,6001-6003,6012-6013,6016,6019,6025-6027,6029,6040,6070,6073,6077-6079,6081,6083-6084,6086,6089,6091,6093,6095,6101,6103,6118,6120,6129,6137,6139,6152-6153,6155,6159,6161,6166,6168,6173,6175,6178-6179,6184-6185,6188,6268,6272,6295,6305-6306,6310,6315,6333,6335,6354,6397,6427,6437,6452,6458-6459,6469-6470,6491,6645,6778,6852,6865,7242,7249,7659,7755,7758,7762-7763,7768,7806,7827,7847,7866,7936,7967,8020,8024,8029 + /gfarm_v2/branches/2.4/gftool/gfdump:5271,5275-5281,5290,5329 /gfarm_v2/branches/2.5.7/gftool/gfdump:6801,6804,6989,6998-6999,7572,7945,8115 /gfarm_v2/branches/2.6/gftool/gfdump:7243,7250,7419,8021,8025,8032 /gfarm_v2/trunk/gftool/gfdump:5598,5616-5624,5626-5628,5641-5647,5650,5653,5657-5666,5670,5674,5683-5685,5693,5695-5696,5699,5719-5720,5727,5729-5730,5775,5793,5799,5808-5809,5821,5825,5827-5831,5839-5842,5844-5849,5863-5864,5868,5870,5874-5878,5881,5886,5889,5913,5915,5924,5932,5934,5959,6001-6003,6012-6013,6016,6019,6025-6027,6029,6040,6070,6073,6077-6079,6081,6083-6084,6086,6089,6091,6093,6095,6101,6103,6118,6120,6129,6137,6139,6152-6153,6155,6159,6161,6166,6168,6173,6175,6178-6179,6184-6185,6188,6268,6272,6295,6305-6306,6310,6315,6333,6335,6354,6397,6427,6437,6452,6458-6459,6469-6470,6491,6645,6778,6852,6865,7242,7249,7659,7755,7758,7762-7763,7768,7806,7827,7847,7866,7936,7967,8020,8024,8029 Property changes on: gfarm_v2/branches/2.5/gftool/gfdump/gfdump.postgresql.in ___________________________________________________________________ Modified: svn:mergeinfo - /gfarm_v2/branches/2.5.7/gftool/gfdump/gfdump.postgresql.in:6801,6804,6989,6998-6999,7572,7945 /gfarm_v2/branches/2.6/gftool/gfdump/gfdump.postgresql.in:7243,7250,7419,8021,8025,8032 /gfarm_v2/trunk/gftool/gfdump/gfdump.postgresql.in:5626,5881,6491,6645,6778,6852,6865,7242,7249,7659,7755,7758,7762-7763,7768,7806,7827,7847,7866,7936,7967,8020,8024,8029 + /gfarm_v2/branches/2.5.7/gftool/gfdump/gfdump.postgresql.in:6801,6804,6989,6998-6999,7572,7945,8115 /gfarm_v2/branches/2.6/gftool/gfdump/gfdump.postgresql.in:7243,7250,7419,8021,8025,8032 /gfarm_v2/trunk/gftool/gfdump/gfdump.postgresql.in:5626,5881,6491,6645,6778,6852,6865,7242,7249,7659,7755,7758,7762-7763,7768,7806,7827,7847,7866,7936,7967,8020,8024,8029 Property changes on: gfarm_v2/branches/2.5/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.7/gftool/gfgroup/gfgroup.c:6801,6804,6989,6998-6999,7572,7945 /gfarm_v2/branches/2.6/gftool/gfgroup/gfgroup.c:7243,7250,7419,8021,8025,8032 /gfarm_v2/trunk/gftool/gfgroup/gfgroup.c:5598,5616-5624,5626-5628,5641-5647,5650,5653,5657-5666,5670,5674,5683-5685,5693,5695-5696,5699,5719-5720,5727,5729-5730,5775,5793,5799,5808-5809,5821,5827-5831,5839-5842,5844-5849,5863-5864,5868,5870,5874-5878,5881,5886,5889,5913,5915,5924,5932,5934,5959,6001-6003,6012-6013,6016,6019,6025-6027,6029,6040,6062,6065,6073,6078,6091,6093,6118,6137,6152-6153,6155,6159,6161,6166,6168,6173,6175,6178-6179,6184-6185,6188,6268,6272,6295,6305-6306,6310,6315,6333,6335,6354,6397,6427,6437,6452,6458-6459,6469-6470,6645,6778,6852,6865,7242,7249,7659,7755,7758,7762-7763,7768,7806,7827,7847,7866,7936,7967,8020,8024,8029 + /gfarm_v2/branches/2.4/gftool/gfgroup/gfgroup.c:5271,5275-5281,5290,5329,5335 /gfarm_v2/branches/2.5.7/gftool/gfgroup/gfgroup.c:6801,6804,6989,6998-6999,7572,7945,8115 /gfarm_v2/branches/2.6/gftool/gfgroup/gfgroup.c:7243,7250,7419,8021,8025,8032 /gfarm_v2/trunk/gftool/gfgroup/gfgroup.c:5598,5616-5624,5626-5628,5641-5647,5650,5653,5657-5666,5670,5674,5683-5685,5693,5695-5696,5699,5719-5720,5727,5729-5730,5775,5793,5799,5808-5809,5821,5827-5831,5839-5842,5844-5849,5863-5864,5868,5870,5874-5878,5881,5886,5889,5913,5915,5924,5932,5934,5959,6001-6003,6012-6013,6016,6019,6025-6027,6029,6040,6062,6065,6073,6078,6091,6093,6118,6137,6152-6153,6155,6159,6161,6166,6168,6173,6175,6178-6179,6184-6185,6188,6268,6272,6295,6305-6306,6310,6315,6333,6335,6354,6397,6427,6437,6452,6458-6459,6469-6470,6645,6778,6852,6865,7242,7249,7659,7755,7758,7762-7763,7768,7806,7827,7847,7866,7936,7967,8020,8024,8029 Modified: gfarm_v2/branches/2.5/include/gfarm/gfarm_msg_enums.h =================================================================== --- gfarm_v2/branches/2.5/include/gfarm/gfarm_msg_enums.h 2013-04-22 04:47:37 UTC (rev 8115) +++ gfarm_v2/branches/2.5/include/gfarm/gfarm_msg_enums.h 2013-04-22 04:50:50 UTC (rev 8116) @@ -3699,3 +3699,6 @@ #define GFARM_MSG_1003697 1003697 #define GFARM_MSG_1003698 1003698 #define GFARM_MSG_1003699 1003699 +#define GFARM_MSG_1003700 1003700 +#define GFARM_MSG_1003701 1003701 +#define GFARM_MSG_1003702 1003702 Property changes on: gfarm_v2/branches/2.5/lib/libgfarm/gfarm ___________________________________________________________________ Modified: svn:mergeinfo - /gfarm_v2/branches/2.6/lib/libgfarm/gfarm:8002,8021,8025,8032 /gfarm_v2/trunk/lib/libgfarm/gfarm:7993,8001,8020,8024,8029 + /gfarm_v2/branches/2.5.7/lib/libgfarm/gfarm:8115 /gfarm_v2/branches/2.6/lib/libgfarm/gfarm:8002,8021,8025,8032 /gfarm_v2/trunk/lib/libgfarm/gfarm:7993,8001,8020,8024,8029 Modified: gfarm_v2/branches/2.5/makes/.msgno =================================================================== --- gfarm_v2/branches/2.5/makes/.msgno 2013-04-22 04:47:37 UTC (rev 8115) +++ gfarm_v2/branches/2.5/makes/.msgno 2013-04-22 04:50:50 UTC (rev 8116) @@ -1 +1 @@ -1003699 \ No newline at end of file +1003702 \ No newline at end of file Modified: gfarm_v2/branches/2.5/server/gfmd/fs.c =================================================================== --- gfarm_v2/branches/2.5/server/gfmd/fs.c 2013-04-22 04:47:37 UTC (rev 8115) +++ gfarm_v2/branches/2.5/server/gfmd/fs.c 2013-04-22 04:50:50 UTC (rev 8116) @@ -3297,7 +3297,7 @@ "%s: peer_delete_cookie() failed", diag); e = GFARM_ERR_BAD_COOKIE; } else if (result != GFARM_ERR_NO_ERROR) { - gflog_warning(GFARM_MSG_UNFIXED, + gflog_warning(GFARM_MSG_1003702, "%s: host %s, cookie %lld: " "new generation rename: %s\n", diag, host_name(spool_host), (long long)cookie, Modified: gfarm_v2/branches/2.5/server/gfmd/gfmd.c =================================================================== --- gfarm_v2/branches/2.5/server/gfmd/gfmd.c 2013-04-22 04:47:37 UTC (rev 8115) +++ gfarm_v2/branches/2.5/server/gfmd/gfmd.c 2013-04-22 04:50:50 UTC (rev 8116) @@ -817,7 +817,7 @@ * set cs->cause, if it's first error at a main part * of a COMPOUND block */ - gflog_debug(GFARM_MSG_UNFIXED, + gflog_debug(GFARM_MSG_1003700, "resumed action failed in a COMPOUND block: %s", gfarm_error_string(e)); if (cs->cause == GFARM_ERR_NO_ERROR && !cs->skip) Modified: gfarm_v2/branches/2.5/server/gfmd/inode.c =================================================================== --- gfarm_v2/branches/2.5/server/gfmd/inode.c 2013-04-22 04:47:37 UTC (rev 8115) +++ gfarm_v2/branches/2.5/server/gfmd/inode.c 2013-04-22 04:50:50 UTC (rev 8116) @@ -4368,7 +4368,7 @@ if (FILE_COPY_IS_VALID(copy)) { e = remove_replica_metadata(inode, copy->host); if (e != GFARM_ERR_NO_ERROR) { - gflog_error(GFARM_MSG_UNFIXED, + gflog_error(GFARM_MSG_1003701, "remove_replica_metadata(" "%lld, %lld, %s): %s", (unsigned long long)inode->i_number, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |