Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

Spack
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

eb5efed4

Commit eb5efed4 authored 10 years ago by Todd Gamblin

Downloads
- Plain Diff

Merge branch 'features/postgresql' into develop

- add spack cd command.
- Fix bug in modules hook

Conflicts:
	lib/spack/spack/cmd/stage.py
	lib/spack/spack/hooks/dotkit.py
	share/spack/setup-env.bash

parents 5a9ef130 e301d623

Branches

Tags

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

lib/spack/spack/__init__.py 23 additions, 18 deletions

lib/spack/spack/__init__.py
lib/spack/spack/cmd/stage.py 35 additions, 6 deletions

lib/spack/spack/cmd/stage.py
lib/spack/spack/hooks/tclmodule.py 2 additions, 2 deletions

lib/spack/spack/hooks/tclmodule.py
share/spack/csh/spack.csh 4 additions, 0 deletions

share/spack/csh/spack.csh
share/spack/setup-env.sh 5 additions, 0 deletions

share/spack/setup-env.sh
var/spack/packages/openssl/package.py 26 additions, 0 deletions

var/spack/packages/openssl/package.py
var/spack/packages/postgresql/package.py 20 additions, 0 deletions

var/spack/packages/postgresql/package.py
var/spack/packages/tau/package.py 0 additions, 1 deletion

var/spack/packages/tau/package.py

with 115 additions and 27 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment