Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: puppetlabs/puppetlabs-java
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.4.1
Choose a base ref
...
head repository: puppetlabs/puppetlabs-java
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1.4.2
Choose a head ref
  • 10 commits
  • 8 files changed
  • 6 contributors

Commits on Jul 15, 2015

  1. Merge pull request #137 from puppetlabs/1.4.x 

    mergeback 1.4.x
    @bmjen
    bmjen committed Jul 15, 2015
    Configuration menu
    Copy the full SHA
    abd490d View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2015

  1. Fix rspec deprecation warnings. .should -> expect().to

    @vStone
    vStone committed Sep 29, 2015
    Configuration menu
    Copy the full SHA
    8bef423 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #141 from vrtdev/feature/fix_spec_deprecation_warn… 

    …ings

Fix rspec deprecation warnings. .should -> expect().to
    @hunner
    hunner committed Sep 29, 2015
    Configuration menu
    Copy the full SHA
    913a810 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2015

  1. (MAINT) declare an exclusion filter for the tests using with_env on f… 

    …acter 1.6

The with_env function is not available in facter 1.6 and OpenBSD is not
supported.
    @DavidS
    DavidS committed Oct 1, 2015
    Configuration menu
    Copy the full SHA
    3645364 View commit details
    Browse the repository at this point in the history

  2. (MODULES-2637) Checks java actually installed 

    The other method for running which java doesn't work on OSX, as java is installed as an empty shim when not installed in the base OSX image:

```
vagrant:~ vagrant$ java
No Java runtime present, requesting install.
vagrant:~ vagrant$ /usr/libexec/java_home --failfast
Unable to find any JVMs matching version "(null)".
vagrant:~ vagrant$
```

We can use the `/usr/libexec/java_home --failfast` command to check if
java is actually present first.

Originally-by: Peter Souter <peter.souter@puppetlabs.com>
    @DavidS
    DavidS committed Oct 1, 2015
    Configuration menu
    Copy the full SHA
    dadc7a6 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #142 from DavidS/MODULES-2637-java_version_on_OSX 

    (MODULES-2637) Checks java actually installed
    @hunner
    hunner committed Oct 1, 2015
    Configuration menu
    Copy the full SHA
    8eee08c View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2015

  1. Merge pull request #143 from puppetlabs/master 

    Update 1.4.x with master changes
    @mentat
    mentat committed Oct 6, 2015
    Configuration menu
    Copy the full SHA
    65476bd View commit details
    Browse the repository at this point in the history

  2. Release 1.4.2

    @hunner
    hunner committed Oct 6, 2015
    Configuration menu
    Copy the full SHA
    c47711e View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2015

  1. Merge pull request #144 from hunner/release_1.4.2 

    Release 1.4.2
    @jonnytdevops
    jonnytdevops committed Oct 7, 2015
    Configuration menu
    Copy the full SHA
    a9198d2 View commit details
    Browse the repository at this point in the history

  2. Fix fixtures

    @hunner
    hunner committed Oct 7, 2015
    Configuration menu
    Copy the full SHA
    faede8c View commit details
    Browse the repository at this point in the history
Loading