Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

12xmerge #61

Merged
merged 23 commits into from May 13, 2014
Merged

12xmerge #61

merged 23 commits into from May 13, 2014

Commits on Feb 27, 2014

  1. Make it all work on solaris...

    @hunner
    Branan Purvine-Riley authored and hunner committed Feb 27, 2014
    Copy the full SHA
    befbb7b View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2014

  1. Merge pull request #47 from hunner/fix_sol10_but_at_what_cost 

    Make it all work on solaris...
    Branan Purvine-Riley committed Feb 28, 2014
    Copy the full SHA
    501df31 View commit details
    Browse the repository at this point in the history

  2. Adding AIX paths for java6

    @hunner
    hunner committed Feb 28, 2014
    Copy the full SHA
    d95b6f8 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #48 from hunner/fix_aix 

    Adding AIX paths for java6
    Branan Purvine-Riley committed Feb 28, 2014
    Copy the full SHA
    d81ecc0 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2014

  1. Adds "Release Notes/Known Bugs" to Changelog, updates file format to … 

    …markdown, standardizes the format of previous entries

Per a request to have initial release notes that specifically listed known issues for this PE 3.2 release, and barred by time constraints from automating a pull from open issues in JIRA, this commit adds a Release Note and Known Bug section to the Changelog for the imminent 3.2 release. As it will display on the Forge, updates file type to markdown and standardizes previous entries. Adds template for release notes to be filled in later.
    Lauren Rother committed Mar 2, 2014
    Copy the full SHA
    e47d76b View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2014

  1. Merge pull request #50 from laurenrother/1.2.x 

    Adds "Release Notes/Known Bugs" to Changelog, updates file format to markdown, standardizes the format of previous entries
    Ashley Penney committed Mar 3, 2014
    Copy the full SHA
    0e5da64 View commit details
    Browse the repository at this point in the history

  2. Prepare metadata for supported modules.

    Ashley Penney committed Mar 3, 2014
    Copy the full SHA
    fab837f View commit details
    Browse the repository at this point in the history

  3. Merge pull request #49 from apenney/add-metadata 

    Prepare metadata for supported modules.
    @hunner
    hunner committed Mar 3, 2014
    Copy the full SHA
    03f3ac1 View commit details
    Browse the repository at this point in the history

  4. Prepare supported 1.2.2 release.

    Ashley Penney committed Mar 3, 2014
    Copy the full SHA
    f41783f View commit details
    Browse the repository at this point in the history

  5. Merge pull request #51 from apenney/supported-122 

    Prepare supported 1.2.2 release.
    @hunner
    hunner committed Mar 3, 2014
    Copy the full SHA
    3a8f3ba View commit details
    Browse the repository at this point in the history

  6. Ensure this works in irb.

    Ashley Penney committed Mar 3, 2014
    Copy the full SHA
    d74dddd View commit details
    Browse the repository at this point in the history

  7. Merge pull request #52 from apenney/fix-metadata 

    Ensure this works in irb.
    Ashley Penney committed Mar 3, 2014
    Copy the full SHA
    048f6e8 View commit details
    Browse the repository at this point in the history

  8. Add missing fields back to work around Puppet bug.

    Ashley Penney committed Mar 3, 2014
    Copy the full SHA
    202d309 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #53 from apenney/last-minute-metadata-fix 

    Add missing fields back to work around Puppet bug.
    @hunner
    hunner committed Mar 3, 2014
    Copy the full SHA
    bad36a2 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2014

  1. Replace the symlink with the actual file to resolve a PMT issue.

    Ashley Penney committed Mar 4, 2014
    Copy the full SHA
    8b92b9d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #54 from apenney/fix-symlinks 

    Replace the symlink with the actual file to resolve a PMT issue.
    @hunner
    hunner committed Mar 4, 2014
    Copy the full SHA
    c2521d9 View commit details
    Browse the repository at this point in the history

  3. Prepare a 1.2.3 supported release.

    Ashley Penney committed Mar 4, 2014
    Copy the full SHA
    ea926c2 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #55 from apenney/123-release 

    Prepare a 1.2.3 supported release.
    @hunner
    hunner committed Mar 4, 2014
    Copy the full SHA
    9741919 View commit details
    Browse the repository at this point in the history

  5. Add Scientific linux as a supported platform

    @hunner
    hunner committed Mar 4, 2014
    Copy the full SHA
    95d7f64 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #56 from hunner/support_sci 

    Add Scientific linux as a supported platform
    Ashley Penney committed Mar 4, 2014
    Copy the full SHA
    01c9ffd View commit details
    Browse the repository at this point in the history

  7. Fix the { location in metadata.json

    @hunner
    hunner committed Mar 4, 2014
    Copy the full SHA
    74167b8 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #57 from hunner/fix_json 

    Fix the { location in metadata.json
    Ashley Penney committed Mar 4, 2014
    Copy the full SHA
    c1dfe13 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2014

  1. Merge branch '1.2.x' into 12xmerge

    Ashley Penney committed May 13, 2014
    Copy the full SHA
    11b9f01 View commit details
    Browse the repository at this point in the history