Skip to content
Snippets Groups Projects
Commit db79642b authored by deshmukh's avatar deshmukh
Browse files

complete the merge

parent 81016336
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 4 deletions
build/buildcvs
+ 0
− 4
View file @ db79642b
...@@ -174,11 +174,7 @@ case "$lustretag" in ...@@ -174,11 +174,7 @@ case "$lustretag" in
;; ;;
# CMD3 # 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|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. # Update b1_8 above when changing this.
ldiskfstag="b1_8_iam" ldiskfstag="b1_8_iam"
;; ;;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

https://git.gsi.de is provided by CIT→Linux&Web | GSI Helmholtzzentrum fuer Schwerionenforschung GmbH | Imprint (in German) | Privacy policy