Commits on Aug 26, 2014

  1. Updates based on QA feedback.

    Lauren Rother committed Aug 26, 2014
    Configuration menu
    Copy the full SHA
    a210b6d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #27 from laurenrother/readme 

    Updates based on QA feedback.
    Morgan Haskel committed Aug 26, 2014
    Configuration menu
    Copy the full SHA
    f7f7b1f View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2014

  1. Spec helper updates for more consistency

    Morgan Haskel committed Aug 28, 2014
    Configuration menu
    Copy the full SHA
    5449d0a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #30 from mhaskel/spec_updates 

    Spec helper updates for more consistency
    Ashley Penney committed Aug 28, 2014
    Configuration menu
    Copy the full SHA
    da74aa8 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2014

  1. commit cleanup.

    @hunner @zshahan
    hunner authored and zshahan committed Aug 31, 2014
    Configuration menu
    Copy the full SHA
    4c37e41 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2014

  1. Merge remote-tracking branch 'upstream/1.0.x' into test

    Morgan Haskel committed Sep 2, 2014
    Configuration menu
    Copy the full SHA
    32a9142 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #31 from mhaskel/test 

    merge 1.0.x into master
    Ashley Penney committed Sep 2, 2014
    Configuration menu
    Copy the full SHA
    e15f5a3 View commit details
    Browse the repository at this point in the history

  3. New tomcat release...

    Morgan Haskel committed Sep 2, 2014
    Configuration menu
    Copy the full SHA
    f883bfa View commit details
    Browse the repository at this point in the history

  4. Merge pull request #32 from mhaskel/update_tomcat8 

    New tomcat release...
    Ashley Penney committed Sep 2, 2014
    Configuration menu
    Copy the full SHA
    c35da7e View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2014

  1. regex the current version of tomcat 8.0.x

    Zach Reichert committed Sep 3, 2014
    Configuration menu
    Copy the full SHA
    f049c11 View commit details
    Browse the repository at this point in the history

  2. regex current version of Tomcat 6.0.x and 7.0.x

    Zach Reichert committed Sep 3, 2014
    Configuration menu
    Copy the full SHA
    e1c5a5e View commit details
    Browse the repository at this point in the history

  3. Merge pull request #33 from zreichert/tests/master/stable_tomcat_version 

    regex the current version of tomcat 8.0.x
    Morgan Haskel committed Sep 3, 2014
    Configuration menu
    Copy the full SHA
    f94fcb8 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'setenv-fix' of github.com:zshahan/puppetlabs-tomcat int… 

    …o setenv_fix

Conflicts:
	manifests/setenv/entry.pp
	spec/defines/setenv/entry_spec.rb
    Morgan Haskel committed Sep 3, 2014
    Configuration menu
    Copy the full SHA
    9260fa9 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #35 from mhaskel/setenv_fix 

    Setenv fix
    Morgan Haskel committed Sep 3, 2014
    Configuration menu
    Copy the full SHA
    6365a65 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2014

  1. 1.0.1 prep

    Morgan Haskel committed Sep 4, 2014
    Configuration menu
    Copy the full SHA
    72199f2 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #40 from mhaskel/1.0.1-prep 

    1.0.1 prep
    Ashley Penney committed Sep 4, 2014
    Configuration menu
    Copy the full SHA
    24ff2cd View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/1.0.x' into test

    Morgan Haskel committed Sep 4, 2014
    Configuration menu
    Copy the full SHA
    9135821 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #42 from mhaskel/test 

    Test
    Morgan Haskel committed Sep 4, 2014
    Configuration menu
    Copy the full SHA
    18e2220 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2014

  1. Fix version key for dependencies in metadata.json.

    @scotje
    scotje committed Sep 11, 2014
    Configuration menu
    Copy the full SHA
    340b28e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #43 from scotje/fix_metadata 

    Fix version key for dependencies in metadata.json.
    Morgan Haskel committed Sep 11, 2014
    Configuration menu
    Copy the full SHA
    74c9446 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2014

  1. MODULES-1295: Multiple connectors with same protocol 

    When tomcat::config::server::connector was initially designed the
assumption was made that the connector protocol would be unique for a
tomcat instance. It is much more reasonable to assume that the connector
port will be unique as you cannot actually bind two things to the same
port.
    Morgan Haskel committed Sep 18, 2014
    Configuration menu
    Copy the full SHA
    2ea5ba5 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #44 from mhaskel/connector_fix 

    MODULES-1295: Multiple connectors with same protocol
    @hunner
    hunner committed Sep 18, 2014
    Configuration menu
    Copy the full SHA
    e0e3299 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2014

  1. Fix typo: congfiguration -> configuration

    @thunderkeys
    thunderkeys committed Sep 24, 2014
    Configuration menu
    Copy the full SHA
    021437f View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2014

  1. Merge pull request #45 from thunderkeys/config_typo_fix 

    Fix typo: congfiguration -> configuration
    Morgan Haskel committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    1ab44c9 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2014

  1. Tomcat strict variables 

    I believe this will cover the strict variables failures in tomcat,
although it is dependent on fixes in nanliu-staging and
puppetlabs-concat.
    Morgan Haskel committed Oct 8, 2014
    Configuration menu
    Copy the full SHA
    58246fe View commit details
    Browse the repository at this point in the history

  2. Update compatibility info in metadata

    Morgan Haskel committed Oct 8, 2014
    Configuration menu
    Copy the full SHA
    c48090a View commit details
    Browse the repository at this point in the history

  3. Merge pull request #47 from mhaskel/metadata 

    Update compatibility info in metadata
    @cmurphy
    cmurphy committed Oct 8, 2014
    Configuration menu
    Copy the full SHA
    723d2de View commit details
    Browse the repository at this point in the history

  4. Merge pull request #46 from mhaskel/future_parser 

    Tomcat strict variables
    @cmurphy
    cmurphy committed Oct 8, 2014
    Configuration menu
    Copy the full SHA
    6b074fa View commit details
    Browse the repository at this point in the history

  5. More strict var unit test fixes

    Morgan Haskel committed Oct 8, 2014
    Configuration menu
    Copy the full SHA
    f82f80f View commit details
    Browse the repository at this point in the history

  6. Merge pull request #48 from mhaskel/strict_vars 

    More strict var unit test fixes
    @hunner
    hunner committed Oct 8, 2014
    Configuration menu
    Copy the full SHA
    eed4294 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2014

  1. (FM-1912) Illegal version range in puppetlabs-tomcat requirements 

    Use correct version_requirement syntax for "pe" requirement
    @thallgren
    thallgren committed Oct 12, 2014
    Configuration menu
    Copy the full SHA
    809ce0b View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2014

  1. Merge pull request #50 from thallgren/master 

    (FM-1912) Illegal version range in puppetlabs-tomcat requirements
    Morgan Haskel committed Oct 13, 2014
    Configuration menu
    Copy the full SHA
    b527545 View commit details
    Browse the repository at this point in the history

  2. update stdlib requirement to 4.2.0 

    puppetlabs-tomcat makes use of delete_undef_values(), which appeared in puppetlabs-stdlib 4.2.0.
    @timmooney
    timmooney committed Oct 13, 2014
    Configuration menu
    Copy the full SHA
    4f7efed View commit details
    Browse the repository at this point in the history

  3. Merge pull request #49 from timmooney/master 

    update stdlib requirement to 4.2.0
    Morgan Haskel committed Oct 13, 2014
    Configuration menu
    Copy the full SHA
    24a30be View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2014

  1. 1.1.0 prep

    Morgan Haskel committed Oct 24, 2014
    Configuration menu
    Copy the full SHA
    ba73bb5 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #54 from mhaskel/1.1.0-prep 

    1.1.0 prep
    @hunner
    hunner committed Oct 24, 2014
    Configuration menu
    Copy the full SHA
    a57cd18 View commit details
    Browse the repository at this point in the history