Skip to content

Commit 6900926

Browse files
suykerbuykMikhail Pridushchenko
authored and
Mikhail Pridushchenko
committed
Squashed commit of the following:
- Restore Seagate spec file meta data - Switch tarball extension from .tgz to .tar.gz to match Robinhood - More spec file updates to dial in lustre-client vs lustre server - Update default robinhood version from 1.0 to 3.0
1 parent 841f136 commit 6900926

File tree

4 files changed

+672
-39
lines changed

4 files changed

+672
-39
lines changed

.gitignore

+42
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,17 @@ Makefile
1414
*~
1515
\#*\#
1616
TAGS
17+
<<<<<<< HEAD
1718
cscope.*
1819
build_failed
1920
RPMBUILD
21+
||||||| merged common ancestors
22+
=======
23+
build_failed
24+
RPMBUILD
25+
>>>>>>> Squashed commit of the following:
2026

27+
<<<<<<< HEAD
2128
/autotools/depcomp
2229
/autotools/install-sh
2330
/autotools/ltmain.sh
@@ -35,6 +42,41 @@ RPMBUILD
3542
/autotools/test-driver
3643
/autom4te.cache
3744
/config.status
45+
||||||| merged common ancestors
46+
# /autotools/depcomp
47+
# /autotools/install-sh
48+
# /autotools/ltmain.sh
49+
# /autotools/missing
50+
# /autotools/compile
51+
# /autotools/config.guess
52+
# /autotools/config.sub
53+
# /autotools/ar-lib
54+
# /autotools/m4/libtool.m4
55+
# /autotools/m4/ltoptions.m4
56+
# /autotools/m4/ltsugar.m4
57+
# /autotools/m4/ltversion.m4
58+
# /autotools/m4/lt~obsolete.m4
59+
# /autotools/ylwrap
60+
# /autom4te.cache
61+
# /config.status
62+
=======
63+
# /autotools/depcomp
64+
# /autotools/install-sh
65+
# /autotools/ltmain.sh
66+
# /autotools/missing
67+
# /autotools/compile
68+
# /autotools/config.guess
69+
# /autotools/config.sub
70+
# /autotools/ar-lib
71+
# /autotools/m4/libtool.m4
72+
# /autotools/m4/ltoptions.m4
73+
# /autotools/m4/ltsugar.m4
74+
# /autotools/m4/ltversion.m4
75+
# /autotools/m4/lt~obsolete.m4
76+
# /autotools/ylwrap
77+
/autom4te.cache
78+
/config.status
79+
>>>>>>> Squashed commit of the following:
3880
/libtool
3981
/Makefile
4082
/aclocal.m4

0 commit comments

Comments
 (0)