# This file is sourced by lustre/lustrecvs
portalstag=""
-lnettag="HEAD"
+lnettag="b1_x"
libsysiotag="HEAD"
snmptag="HEAD"
ldiskfstag="HEAD"
+ldiskfstag_head="b1_8_iam"
+lustreiokittag="HEAD"
+libcfstag="b1_x"
+dmutag="" # uDMU
+spltag=""
+zfstag=""
+hg_base_url="http://www.wizy.org/mercurial"
+git_base_url="git@git.lustre.org:%s.git"
export LC_COLLATE=C
# this is the branch table
# keep this list sorted alphabetically!
- # Note these are "specials" -- branches using lnet HEAD don't need an
+ # Note these are "specials" -- branches using lnet b1_x don't need an
# entry here.
b1_2)
portalstag="b_hd_newconfig"
;;
- b1_8)
- # b1_8 is an alias for HEAD.
- lustretag="HEAD"
- ldiskfstag="b1_8_iam"
+ b_cmd_cray)
+ lnettag="HEAD"
+ ldiskfstag="$ldiskfstag_head"
+ libcfstag="HEAD"
;;
b_cmd*)
b_mpilnd)
# lnet mpilnd development branch
- lnettag="b_mpilnd"
- lustretag="HEAD"
- ;;
+ lnettag="b_mpilnd"
+ lustretag="HEAD"
+ ;;
b_new_cmd)
- portalstag="b_new_portals"
+ portalstag="b_new_portals"
# lnettag="b_lnet_tmp"
;;
b_self_test)
# lnet self test development branch
- lnettag="b_self_test"
- lustretag="HEAD"
- ;;
+ lnettag="b_self_test"
+ lustretag="HEAD"
+ ;;
b_usocklnd)
# lnet usocklnd development branch
- lnettag="b_usocklnd"
- lustretag="b1_6_usocklnd"
- ;;
+ lnettag="b_usocklnd"
+ lustretag="b1_6_usocklnd"
+ ;;
b_uo2iblnd)
# lnet u-o2iblnd development branch
lustretag="HEAD"
;;
+ b_hd_lnet_smp)
+ # LNet grained locking and SMP improvement branch
+ libcfstag="b_hd_libcfs_smp"
+ lnettag="b_hd_lnet_smp"
+ ldiskfstag="$ldiskfstag_head"
+ lustretag="b_hd_lustre_smp"
+ ;;
+
+ b_hd_o2ib_new_proto)
+ # LNet branch for new o2iblnd protocol (15983, 13621, 14425, 14358)
+ lnettag="b_hd_o2ib_new_proto"
+ ldiskfstag="$ldiskfstag_head"
+ lustretag="HEAD"
+ libcfstag="HEAD"
+ ;;
+
b_ula)
# lnet "User Level Access" development branch
- lnettag="b_ula"
- lustretag="HEAD"
- ldiskfstag="b1_8_iam"
- ;;
+ lnettag="b_ula"
+ lustretag="HEAD"
+ ldiskfstag="$ldiskfstag_head"
+ ;;
# CMD3
- HEAD|b_post_cmd3|b_HEAD_AT|b_new_cmd_sles10|b1_6_head_sync|b1_8_dir_ra|b_colibri_devel|b_mixed_layout_req|b_remote_acl|b_mount_perm|b1_8_gns)
+ b_post_cmd3|b_new_cmd_sles10|b1_6_head_sync|b_mixed_layout_req|b_mount_perm|b1_8_gns|b1_8_interop_server)
# Update b1_8 above when changing this.
- ldiskfstag="b1_8_iam"
+ ldiskfstag="$ldiskfstag_head"
+ ;;
+
+ #umds cleanup
+ b_hd_umds_cln2)
+ ldiskfstag="b1_8_iam_dynlock"
;;
# uOSS
b_hd_dmu)
lnettag="b_uoss"
+ ldiskfstag="$ldiskfstag_head"
+ dmutag="zfs-lustre"
+ ;;
+
+ # read-only cache for oss
+ b_hd_rocache_oss)
+ lnettag="HEAD"
ldiskfstag="b1_8_iam"
+ libcfstag="HEAD"
+ ;;
+
+ # vector read/write
+ b_hd_readx)
+ lnettag="HEAD"
+ ldiskfstag="$ldiskfstag_head"
+ libcfstag="HEAD"
+ ;;
+
+ # params_tree
+ b_hd_params_tree)
+ lnettag="b_hd_params_tree"
+ ldiskfstag="$ldiskfstag_head"
+ libcfstag="b_hd_params_tree"
+ lustretag="b_hd_params_tree"
+ ;;
+
+ # Network request scheduler
+ b_hd_nrs)
+ lnettag="HEAD"
+ ldiskfstag="$ldiskfstag_head"
+ libcfstag="HEAD"
+ ;;
+
+ # uMDS
+ b_dmu_umds)
+ lnettag="b_uoss_umds"
+ ldiskfstag="$ldiskfstag_head"
+ dmutag="zfs-lustre"
+ ;;
+
+ # uOSS o2iblnd
+ b_uoss_o2iblnd)
+ lnettag="b_uoss_o2iblnd"
+ lustretag="b_hd_dmu"
+ ldiskfstag="$ldiskfstag_head"
+ dmutag="zfs-lustre"
;;
# client io stack cleanup
b_client_io_layering)
- ldiskfstag="b1_8_iam"
+ lnettag="HEAD"
+ ldiskfstag="$ldiskfstag_head"
+ libcfstag="HEAD"
+ ;;
+
+ # HEAD cmd fixes
+ b_head_cmd)
+ lnettag="HEAD"
+ ldiskfstag="$ldiskfstag_head"
+ libcfstag="HEAD"
+ ;;
+
+ # windows client porting (lustre: b_client_io_layering, lnet: HEAD)
+ b_winnt_port)
+ ldiskfstag="$ldiskfstag_head"
+ lnettag="b_winnt_port"
+ libcfstag="b_winnt_port"
;;
# v1.0-v1.3, v1.4.0-v1.4.2
snmptag="$lustretag"
;;
+ # Interoperability server side changes
+ b_head_interop_disk)
+ lnettag="HEAD"
+ ldiskfstag="b_ldiskfs_interop_server"
+ libcfstag="HEAD"
+ ;;
+
+ # Branches that have been updated to include
+ # the libcfs split should be added here
+ HEAD|b_head_capa|b_hd_cfld|b_hd_changelog|b_hd_sptlrpc|HD_SPTLRPC_BASE|b_som|b_hd_recov|b_hd_transapi)
+ lnettag="HEAD"
+ ldiskfstag="$ldiskfstag_head"
+ libcfstag="HEAD"
+ ;;
+
+ b_hd_kdmu)
+ # Identical to HEAD + spl and zfs
+ lnettag="HEAD"
+ ldiskfstag="$ldiskfstag_head"
+ libcfstag="HEAD"
+ spltag="pre-alpha"
+ zfstag="top"
+ ;;
+
+ b_head_libcfs)
+ lnettag="b_head_libcfs"
+ ldiskfstag="$ldiskfstag_head"
+ libcfstag="b_head_libcfs"
+ ;;
+
+ b_head_procfs)
+ lnettag="HEAD"
+ ldiskfstag="$ldiskfstag_head"
+ libcfstag="b_head_procfs"
+ ;;
+
+ b2_0-bld*)
+ lnettag="$lustretag"
+ ldiskfstag="$ldiskfstag_head"
+ libcfstag="$lustretag"
+ ;;
+
# all later v* tags
v[1-9]*)
lnettag="$lustretag"
libsysiotag="$lustretag"
snmptag="$lustretag"
ldiskfstag="$lustretag"
+ libcfstag="$lustretag"
+ ;;
+
+ b_HEAD_*|b_head_*|b_hd_*)
+ lnettag="HEAD"
+ ldiskfstag="$ldiskfstag_head"
+ libcfstag="HEAD"
;;
esac
cvs_cmd snmp lustre-snmp "$snmptag"
cvs_cmd lustre lustre-core "$lustretag"
cvs_cmd ldiskfs ldiskfs "$ldiskfstag"
+cvs_cmd lustre-iokit lustre-iokit "$lustreiokittag"
+hg_cmd lustre/zfs-lustre "$hg_base_url" "$dmutag"
+cvs_cmd libcfs libcfs "$libcfstag"
+git_cmd spl spl "$spltag" "$git_base_url"
+git_cmd zfs zfs "$zfstag" "$git_base_url"
[ -a ldiskfs/build ] || ln -sf ../build ldiskfs/build
git://git.whamcloud.com / fs / lustre-release.git / blobdiff