Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Land b_release_1_4_6 onto HEAD (20060223_1429)
[fs/lustre-release.git]
/
build
/
buildcvs
diff --git
a/build/buildcvs
b/build/buildcvs
index
c580ac6
..
741a97d
100644
(file)
--- a/
build/buildcvs
+++ b/
build/buildcvs
@@
-24,47
+24,37
@@
case "$lustretag" in
portalstag="b1_2"
;;
portalstag="b1_2"
;;
- b1_4_
next_recovery_transno
)
+ b1_4_
atime_update
)
snmptag="HEAD"
portalstag="b_hd_newconfig"
snmptag="HEAD"
portalstag="b_hd_newconfig"
- lnettag="b_release_1_4_6"
- libsysiotag="b_release_1_4_6"
+ lnettag="b_hd_newconfig"
;;
;;
- b1_4_
lfs_df
)
+ b1_4_
join
)
snmptag="HEAD"
portalstag="b_hd_newconfig"
snmptag="HEAD"
portalstag="b_hd_newconfig"
- lnettag="b_release_1_4_6"
- libsysiotag="b_release_1_4_6"
- ;;
-
- b1_4_atime_update)
+ lnettag="b_hd_newconfig"
+ ;;
+
+ b1_4_lfs_df)
snmptag="HEAD"
portalstag="b_hd_newconfig"
snmptag="HEAD"
portalstag="b_hd_newconfig"
- lnettag="b_release_1_4_6"
- libsysiotag="b_release_1_4_6"
+ lnettag="b_hd_newconfig"
;;
b1_4_lov_lvb_cleanup)
snmptag="HEAD"
portalstag="b_hd_newconfig"
;;
b1_4_lov_lvb_cleanup)
snmptag="HEAD"
portalstag="b_hd_newconfig"
- lnettag="b_release_1_4_6"
- libsysiotag="b_release_1_4_6"
+ lnettag="b_hd_newconfig"
;;
;;
-
- b1_4_rhel4_22)
- snmptag="HEAD"
- portalstag="b_release_1_4_6"
- lnettag="b_release_1_4_6"
- ;;
- b1_4
| b1_4_*
)
+ b1_4
_next_recovery_transno
)
snmptag="HEAD"
portalstag="b_hd_newconfig"
lnettag="b_hd_newconfig"
snmptag="HEAD"
portalstag="b_hd_newconfig"
lnettag="b_hd_newconfig"
-
;;
-
- b1_4
_join
)
+ ;;
+
+ b1_4
| b1_4_*
)
snmptag="HEAD"
portalstag="b_hd_newconfig"
lnettag="b_hd_newconfig"
snmptag="HEAD"
portalstag="b_hd_newconfig"
lnettag="b_hd_newconfig"
@@
-80,16
+70,16
@@
case "$lustretag" in
portalstag="$lustretag"
;;
portalstag="$lustretag"
;;
- b_ioprovement)
- portalstag=b_ioprovement
- ;;
-
b_iam*)
snmptag="HEAD"
portalstag="b_hd_newconfig"
lnettag="b_hd_newconfig"
;;
b_iam*)
snmptag="HEAD"
portalstag="b_hd_newconfig"
lnettag="b_hd_newconfig"
;;
+ b_ioprovement)
+ portalstag="b_ioprovement"
+ ;;
+
b_newconfig_rdmarouting)
portalstag="b_hd_newconfig"
lnettag="b_newconfig_rdmarouting"
b_newconfig_rdmarouting)
portalstag="b_hd_newconfig"
lnettag="b_newconfig_rdmarouting"
@@
-123,18
+113,22
@@
case "$lustretag" in
portalstag="b_ptlrpc_cleanup"
;;
portalstag="b_ptlrpc_cleanup"
;;
- b_release_*)
- portalstag=$lustretag
+ # starting with 1_4_6, we have a tagged lnet too
+ b_release_1_4_[6-9]*)
+ portalstag="$lustretag"
+ libsysiotag="$lustretag"
+ lnettag="$lustretag"
;;
;;
-
RELEASE_1_4_6_B1_4_JOIN_LAND_PARENT_20051208_1641
)
-
lnettag="b_hd_newconfi
g"
-
portalstag="b_hd_newconfi
g"
+
b_release_*
)
+
portalstag="$lustreta
g"
+
libsysiotag="$lustreta
g"
;;
# v1.0-v1.3, v1.4.0-v1.4.2
v1_[0-3]_*|v1_4_[0-2]*)
portalstag="$lustretag"
;;
# v1.0-v1.3, v1.4.0-v1.4.2
v1_[0-3]_*|v1_4_[0-2]*)
portalstag="$lustretag"
+ libsysiotag="$lustretag"
;;
# v1.4.3-v1.4.5, v1.4.5.1 - v1.4.5.9
;;
# v1.4.3-v1.4.5, v1.4.5.1 - v1.4.5.9