summaryrefslogtreecommitdiffstats
path: root/vagrant
diff options
context:
space:
mode:
authorJames Shubin <james@shubin.ca>2014-05-15 15:38:50 -0400
committerJames Shubin <james@shubin.ca>2014-05-16 14:00:57 -0400
commit84150a0f009bf0f4ec894e31c02407c42a92854b (patch)
tree9b2a6c09ceb04e619dd68367afd719893cde0e75 /vagrant
parent9280d58bc043f169f1feeb5074c8fa8d0507fe07 (diff)
downloadpuppet-gluster-84150a0f009bf0f4ec894e31c02407c42a92854b.tar.gz
puppet-gluster-84150a0f009bf0f4ec894e31c02407c42a92854b.tar.xz
puppet-gluster-84150a0f009bf0f4ec894e31c02407c42a92854b.zip
Match the git tree of the child gluster module to the parent git module.
Like "Back to the Future" (the movie), we can only affect the future, unless we go back to the past (rebasing) to add this feature earlier. So this should only work for versions that are newer that 0.0.3, since I don't want to rebase git master.
Diffstat (limited to 'vagrant')
-rw-r--r--vagrant/gluster/puppet/modules/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/vagrant/gluster/puppet/modules/Makefile b/vagrant/gluster/puppet/modules/Makefile
index 4b66c5e..125051b 100644
--- a/vagrant/gluster/puppet/modules/Makefile
+++ b/vagrant/gluster/puppet/modules/Makefile
@@ -34,7 +34,8 @@ MODULES := \
# NOTE: set to a git commit id if we need an specific commit for vagrant builds
# NOTE: remember that new commits to master should change this to a specific id
# if they will break the vagrant build process. hopefully we don't forget this!
-SHA1SUM := master
+#SHA1SUM := master
+SHA1SUM := $(shell git rev-parse --verify HEAD) # goto whatever the main tree is at
.PHONY: all modules gluster
.SILENT: all modules gluster