/charmbox

Target master branch for test tooling #45

Merged
merged 1 commit into from Aug 10, 2016

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@chuckbutler @mbruzek
@chuckbutler
Contributor

chuckbutler commented Aug 10, 2016 •
Edited 1 time

  • This moves the test tooling which is 2.x and 1.25 compat into the
    master branch
  • Removes any traces of non-docker things in the Dockerfile
  • Should be the foundation for a clean 1 line rebase with :devel branch

Pulls in @mbruzek's work started in #38, and caused #44
@chuckbutler
Target master branch for test tooling 
- This moves the test tooling which is 2.x and 1.25 compat into the
  master branch
- Removes any traces of non-docker things in the Dockerfile
- Should be the foundation for a clean 1 line rebase with :devel branch
d40b959

@chuckbutler chuckbutler referenced this pull request Aug 10, 2016

Closed

:devel is missing `make` and `bundletester` #37

@mbruzek
Contributor

mbruzek commented Aug 10, 2016

+1 looks good to me. Thanks for doing this @chuckbutler, this makes so much more sense.

@mbruzek mbruzek merged commit a749c5f into juju-solutions:master Aug 10, 2016

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