Push the working version of the license code. #40

Merged
merged 1 commit into from Jan 8, 2013

Conversation

Projects
None yet
1 participant
Contributor

slippycheeze commented Jan 8, 2013

The great thing about git is that it is happy to push commits from a dirty
working directory. The bad thing about git is that willingness means I can
push up the older, broken version of a script from before I actually tested
that it worked and not notice.

This moves the copy of the COPYING and LICENSE files to the appropriate part
of the build script, resulting in an end-to-end successful build, rather than
the nasty failure we got with the merged version.

Signed-off-by: Daniel Pittman daniel@rimspace.net

Push the working version of the license code.
The great thing about git is that it is happy to push commits from a dirty
working directory.  The bad thing about git is that willingness means I can
push up the older, broken version of a script from before I actually tested
that it worked and not notice.

This moves the copy of the COPYING and LICENSE files to the appropriate part
of the build script, resulting in an end-to-end successful build, rather than
the nasty failure we got with the merged version.

Signed-off-by: Daniel Pittman <daniel@rimspace.net>

slippycheeze added a commit that referenced this pull request Jan 8, 2013

Merge pull request #40 from daniel-pittman/feature/master/better-iso-…
…file-metadata

Push the working version of the license code.

@slippycheeze slippycheeze merged commit 588429f into puppetlabs:master Jan 8, 2013

@slippycheeze slippycheeze deleted the slippycheeze:feature/master/better-iso-file-metadata branch Jan 8, 2013

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment