Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4f04bf0
)
*** empty log message ***
author
deshmukh
<deshmukh>
Fri, 4 Apr 2008 08:33:44 +0000
(08:33 +0000)
committer
deshmukh
<deshmukh>
Fri, 4 Apr 2008 08:33:44 +0000
(08:33 +0000)
build/buildcvs
patch
|
blob
|
history
diff --git
a/build/buildcvs
b/build/buildcvs
index
e6e5c8b
..
9e44b8f
100644
(file)
--- a/
build/buildcvs
+++ b/
build/buildcvs
@@
-174,7
+174,11
@@
case "$lustretag" in
;;
# CMD3
+<<<<<<< buildcvs
+ HEAD|b_post_cmd3|b_HEAD_AT|b_new_cmd_sles10|b1_6_head_sync|b1_8_dir_ra|b_mixed_layout_req|b_mount_perm|b1_8_gns|b1_8_quota|b1_8_interop_server)
+=======
HEAD|b_post_cmd3|b_HEAD_AT|b_new_cmd_sles10|b1_6_head_sync|b1_8_dir_ra|b_mixed_layout_req|b_mount_perm|b1_8_gns|b1_8_quota|b_som)
+>>>>>>> 1.111
# Update b1_8 above when changing this.
ldiskfstag="b1_8_iam"
;;