Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "remove #to_json Monkeytpatching" | Lamont Granquist | 2014-08-09 | 21 | -47/+49 |
| | | | | This reverts commit adbb0fa85cc45b93ba91dc3019094b312cafb35c. | ||||
* | remove #to_json Monkeypatching | Lamont Granquist | 2014-08-09 | 21 | -49/+47 |
| | |||||
* | Merge pull request #1743 from juliandunn/suse-package-removal-failure | Claire McQuin | 2014-08-08 | 1 | -1/+1 |
|\ | | | | | fix SuSE package removal failure | ||||
| * | [COOK-4028] zypper remove not working wiht OpenSuse 13.1 | Boris Komraz | 2014-08-03 | 1 | -1/+1 |
| | | | | | | | | checking version for nil solves the problem | ||||
* | | Merge pull request #1719 from ↵ | Claire McQuin | 2014-08-08 | 1 | -2/+2 |
|\ \ | | | | | | | | | | | | | evertrue/evertrue/eherot/add_mount_point_word_boundaries Added whitespace boundaries to some of the mount point references in mount resource | ||||
| * | | Add word boundary to mount point regexp in mount mounted function | Eric Herot | 2014-07-30 | 1 | -1/+1 |
| | | | |||||
| * | | Add word boundary to mount point regexp in mount disable function | Eric Herot | 2014-07-30 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #1694 from jordane/jordane/git_branch_B | Claire McQuin | 2014-08-08 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | git provider fails on existing branch names | ||||
| * | | | use -B in case user wants to reset branch | Jordan Evans | 2014-07-25 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #1681 from victorhahncastell/master | Claire McQuin | 2014-08-08 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Apply template syntax check to files in the templates dir only. This avo... | ||||
| * | | | | Apply template syntax check to files in the templates dir only. This avoids ↵ | Victor Hahn - FLEXOPTIX | 2014-07-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | false positives for .erb files in the files subdirectory which are not actually Chef templates. Obvious fix. | ||||
* | | | | | Merge pull request #1676 from higanworks/use_shared_path_for_deploy_resource | Claire McQuin | 2014-08-07 | 1 | -1/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | shared_path can be used to get the path to the shared_path in deploy resource | ||||
| * \ \ \ \ | Merge remote-tracking branch 'upstream/master' into ↵ | sawanoboly | 2014-08-04 | 73 | -670/+316 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | use_shared_path_for_deploy_resource | ||||
| * | | | | | | shared_path can be used to get the path to the shared_path | sawanoboly | 2014-07-22 | 1 | -1/+2 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #1680 from BundesIT/master | Claire McQuin | 2014-08-07 | 2 | -2/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Some minor fixes for the Paludis package provider | ||||
| * | | | | | | whitespace fix in paludis_package.rb | tbe | 2014-07-28 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | moved init of timeout for paludis packages to the right place | Thomas Berger | 2014-07-26 | 2 | -5/+1 |
| | | | | | | | |||||
| * | | | | | | use package.timeout for the cave timeout value | Thomas Berger | 2014-07-25 | 1 | -1/+6 |
| | | | | | | | |||||
| * | | | | | | some paludis fixes | Thomas Berger | 2014-07-23 | 1 | -2/+2 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | - only search for non-masked packages - increased the command timeout for the installation process to a reasonable large number | ||||
* | | | | | | Merge pull request #1669 from Kasen/pcs_support | Claire McQuin | 2014-08-07 | 1 | -0/+9 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Parallels cloud server platform support. | ||||
| * | | | | | | Provider mapping for pcs(parallels cloud server) added. | Pavel Yudin | 2014-07-20 | 1 | -0/+9 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #1667 from parabuzzle/fix_force_flag | Claire McQuin | 2014-08-07 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | [CHEF-1652] Fix force flag | ||||
| * | | | | | | change syntax of error message to reflect the correct flag | Mike Heijmans | 2014-07-19 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #1658 from kgraham/master | Claire McQuin | 2014-08-07 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Bad handling of ShellOut:live_stream | ||||
| * | | | | | | Chef:Provider:Execute's logic on whether or not to use live_stream gets blindly | Kevin Graham | 2014-07-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stomped on here. Honoring live_stream if a caller has set it. Obvious fix. | ||||
* | | | | | | | Merge pull request #1638 from bcobb/version-constraint-string-reflects-behavior | Claire McQuin | 2014-08-07 | 2 | -23/+18 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Chef::VersionConstraint#to_s should accurately reflect the constraint's behavior | ||||
| * | | | | | | | VersionConstraint does not need a raw_version attribute | Brian Cobb | 2014-07-14 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Use Chef::VersionConstraint#to_s in the metadata DSL | Brian Cobb | 2014-07-14 | 1 | -19/+14 |
| | | | | | | | | |||||
| * | | | | | | | Version constraints only show patch level if one is given | Brian Cobb | 2014-07-14 | 1 | -2/+2 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #1616 from chr4/userdel-force | Claire McQuin | 2014-08-07 | 2 | -0/+10 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add "force" attribute to resource/user, passing "-f" to userdel | ||||
| * | | | | | | | | Add "force" attribute to resource/user, passing "-f" to userdel | Chris Aumann | 2014-07-08 | 2 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows removal of logged in users. | ||||
* | | | | | | | | | Merge pull request #1597 from criteo/modify_env | Claire McQuin | 2014-08-07 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Don't modify variable passed to env resource when updating | ||||
| * | | | | | | | | | Don't modify variable passed to env resource when updating | Pierre Ynard | 2014-07-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using a delimiter, the passed value is prepended to the given environment variable. Unfortunately this has the side effect of modifying the variable passed to the resource. Oftentimes this is an attribute, used somewhere else after that, with the wrong, modified value. | ||||
* | | | | | | | | | | Merge pull request #1591 from onddo/CHEF-5356-gcm-2 | Claire McQuin | 2014-08-07 | 7 | -33/+247 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | [CHEF-5356-gcm(2)] Encrypted data bags should use different HMAC key and include the IV in the HMAC | ||||
| * | | | | | | | | | | [CHEF-5356-gcm] moved some requires from decryptor.rb to assertions.rb | Xabier de Zuazo | 2014-07-09 | 2 | -2/+3 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | [CHEF-5356-gcm] Use OpenSSL::Cipher and OpenSSL::Digest instead of ↵ | Xabier de Zuazo | 2014-07-08 | 4 | -13/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenSSL::Cipher::Cipher and OpenSSL::Digest::Digest | ||||
| * | | | | | | | | | | [CHEF-5356-gcm] If the requirements to use Encryted Data Bags 3 are not met, ↵ | Xabier de Zuazo | 2014-07-06 | 4 | -18/+106 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | give a meaningful error message | ||||
| * | | | | | | | | | | [CHEF-5356-gcm] docs updated to clarify ruby 2 requirement | Xabier de Zuazo | 2014-07-01 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | [CHEF-5356-gcm] Chef::Config: Added a comment about EncryptedDataBag version 3 | Xabier de Zuazo | 2014-07-01 | 1 | -1/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | [CHEF-5356-gcm] Chef::EncryptedDataBagItem Version3 implementation using GCM | Xabier de Zuazo | 2014-07-01 | 4 | -11/+135 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #1552 from jordane/fedora-use-systemd | Claire McQuin | 2014-08-07 | 1 | -5/+20 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | use systemd for recent fedora and rhel 7 | ||||
| * | | | | | | | | | | | use systemd on oracle, scientific 7 too | Jordan Evans | 2014-06-27 | 1 | -2/+8 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | use systemd for centos 7 too | Jordan Evans | 2014-06-26 | 1 | -1/+4 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | use systemd for recent fedora and rhel 7 | Jordan Evans | 2014-06-25 | 1 | -2/+8 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #1527 from opscode/ryancragun/OC-11667 | Claire McQuin | 2014-08-07 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [OC-11667] Don't overwrite the :default provider map if :default is passed as the platform | ||||
| * | | | | | | | | | | | | [OC-11667] Don't overwrite the :default provider map if :default is passed ↵ | Ryan Cragun | 2014-06-19 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as the platform | ||||
* | | | | | | | | | | | | | Merge pull request #1177 from xeron/CHEF-3399 | Claire McQuin | 2014-08-07 | 2 | -11/+26 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CHEF-3399] Make data_bag_path an array like cookbook_path | ||||
| * | | | | | | | | | | | | | [CHEF-3399] Raise in case of data bag items conflict. Tests. | Ivan Larionov | 2014-05-31 | 2 | -4/+9 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | [CHEF-3399] Use first seen data bag (do not overwrite). Tests. | Ivan Larionov | 2014-05-31 | 1 | -2/+2 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | [CHEF-3399] Make data_bag_path an array like cookbook_path | Ivan Larionov | 2014-05-31 | 1 | -11/+21 |
| | | | | | | | | | | | | | |