/charm

Add missing commits to v5 #126

Merged
merged 2 commits into from May 5, 2015

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@axw @wallyworld @gabriel-samfira
@axw
Member

axw commented May 5, 2015

v5 is missing a couple of commits required to build on Windows, and some license fixes. Juju nominally uses v5, but was pinned to a commit that only existed in v6-unstable. This PR cherry-picks the required commits into v5.

Martin Packman and others added some commits Apr 10, 2015

@axw
Merge pull request #119 from bz2/licence_header_fix_v5 
Correct licence headers to LGPLv3
87cf11b
@gabriel-samfira @axw
Merge pull request #120 from gabriel-samfira/close-file 
Close file before renaming
641712a
@wallyworld
Owner

wallyworld commented May 5, 2015

LGTM
@wallyworld
Owner

wallyworld commented May 5, 2015

$$merge$$

axw added a commit that referenced this pull request May 5, 2015

@axw
Merge pull request #126 from axw/v5-add-missing-commits 
Add missing commits to v5
192aa73

@axw axw merged commit 192aa73 into juju:v5 May 5, 2015

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