resolved merge conflicts with develop #1
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
v1.0.0 release
…er configure to figure out ustar tarring command (which may make the build hang if pax is run)
enable use of tar_config_opts where needed, bump version
remove unnecessary use of patch file
…at trigger configure to figure out ustar tarring command (which may make the build hang if pax is run)" This reverts commit 4edc6b7. Conflicts: easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3-no-OFED.eb
don't use tar_config_opts in example easyconfigs, disable parallel build for PAPI
v1.0.01, bugfix release
bump version to 1.0.0.2dev
Signed-off-by: Fotis Georgatos <fotis.georgatos@uni.lu>
fixed URL of ligtextutils from toolchain to toolkit
…onfigs into 23_PEP0008fix Conflicts: easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3-no-OFED.eb easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.4.5-GCC-4.6.3.eb
|
Also got rid of tabs, i.e. the stuff you mentioned in easybuilders#52. All easyconfigs should now be clean of tabs: |
|
Made some additional cleanups, I'm very happy with this now. Please merge it in in your repo, then it'll be included in your open pull request to the main easybuild-easyconfigs repo. |
fgeorgatos
added a commit
that referenced
this pull request
Dec 22, 2012
resolved merge conflicts with develop - VOILA, easyconfigs get cleaned up
|
CRL here. flying in 80 minutes. will do so asap.
|
fgeorgatos
pushed a commit
that referenced
this pull request
Jan 17, 2013
minor cleanup in Cufflinks and Tophat easyconfigs (get rid of patches)
fgeorgatos
pushed a commit
that referenced
this pull request
Jan 18, 2013
fixes for GHC, happy, and alex easyconfigs
fgeorgatos
pushed a commit
that referenced
this pull request
Mar 3, 2013
fix filenames, add 'old' source URL for tcsh
fgeorgatos
pushed a commit
that referenced
this pull request
Apr 26, 2013
(properly) use templating, use SOURCELOWER_TAR_GZ
fgeorgatos
pushed a commit
that referenced
this pull request
Jun 1, 2013
fix CMake build dep for mysql (+ sync with develop)
fgeorgatos
pushed a commit
that referenced
this pull request
Jul 3, 2013
use PackedBinary easyblock + style fixes
fgeorgatos
pushed a commit
that referenced
this pull request
Aug 12, 2013
style and consistency fixes
fgeorgatos
pushed a commit
that referenced
this pull request
Aug 25, 2013
use namelower, version, versionsuffix templates
fgeorgatos
pushed a commit
that referenced
this pull request
Sep 30, 2013
use MakeCp easyblock, enable configure
fgeorgatos
added a commit
that referenced
this pull request
Dec 14, 2013
Signed-off-by: Fotis Georgatos <fotis.georgatos@uni.lu>
fgeorgatos
pushed a commit
that referenced
this pull request
Feb 15, 2014
minor style fixes in protobuf easyconfigs
fgeorgatos
pushed a commit
that referenced
this pull request
Mar 13, 2014
fix source specifications for ELPA + minor style fixes
fgeorgatos
pushed a commit
that referenced
this pull request
Mar 13, 2014
add gzip easyconfig to test use of ictce/6.2.5 toolchain
fgeorgatos
pushed a commit
that referenced
this pull request
Apr 13, 2014
change version of goolf v1.6.5 to goolf v1.5.14, to align with existing gompi 1.5.12 easyconfig
fgeorgatos
pushed a commit
that referenced
this pull request
May 26, 2014
add missing popt dependency for pscomp, fix psmpi2 patch file, style fixes
fgeorgatos
pushed a commit
that referenced
this pull request
Sep 14, 2014
add checksum for lockfile in Python 3 easyconfig
fgeorgatos
pushed a commit
that referenced
this pull request
Sep 14, 2014
Merge OpenFOAM-extend cleanup
fgeorgatos
pushed a commit
that referenced
this pull request
Dec 9, 2014
sync with other open SAMtools PR + add intel/2014b easyconfig
fgeorgatos
pushed a commit
that referenced
this pull request
Dec 17, 2014
sync fix_mpich_inconsistencies with develop
fgeorgatos
pushed a commit
that referenced
this pull request
Dec 17, 2014
add missing easyconfigs for icc, ifort, iccifort 2015.1.133
fgeorgatos
pushed a commit
that referenced
this pull request
Mar 16, 2015
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Just two minor edits in the OpenMPI easyconfigs to fix the merge with develop. The other stuff that comes along with it is because your branch is a bit outdated, just ignore those. ;-)