summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1676 from higanworks/use_shared_path_for_deploy_resourceClaire McQuin2014-08-072-1/+6
|\
| * Merge remote-tracking branch 'upstream/master' into use_shared_path_for_deplo...sawanoboly2014-08-04112-998/+1381
| |\
| * | shared_path can be used to get the path to the shared_pathsawanoboly2014-07-222-1/+6
* | | Merge pull request #1680 from BundesIT/masterClaire McQuin2014-08-073-7/+8
|\ \ \
| * | | whitespace fix in paludis_package.rbtbe2014-07-281-1/+1
| * | | moved init of timeout for paludis packages to the right placeThomas Berger2014-07-262-5/+1
| * | | use package.timeout for the cave timeout valueThomas Berger2014-07-252-5/+10
| * | | fixed paludis package provider manifestThomas Berger2014-07-231-5/+5
| * | | some paludis fixesThomas Berger2014-07-231-2/+2
| |/ /
* | | Merge pull request #1669 from Kasen/pcs_supportClaire McQuin2014-08-071-0/+9
|\ \ \
| * | | Provider mapping for pcs(parallels cloud server) added.Pavel Yudin2014-07-201-0/+9
| |/ /
* | | Merge pull request #1667 from parabuzzle/fix_force_flagClaire McQuin2014-08-072-5/+5
|\ \ \
| * | | change syntax of error message to reflect the correct flagMike Heijmans2014-07-191-1/+1
| * | | update spec output to reflect correct flagMike Heijmans2014-07-191-4/+4
| |/ /
* | | Merge pull request #1658 from kgraham/masterClaire McQuin2014-08-071-1/+1
|\ \ \
| * | | Chef:Provider:Execute's logic on whether or not to use live_stream gets blindlyKevin Graham2014-07-161-1/+1
* | | | Merge pull request #1638 from bcobb/version-constraint-string-reflects-behaviorClaire McQuin2014-08-073-23/+46
|\ \ \ \
| * | | | VersionConstraint does not need a raw_version attributeBrian Cobb2014-07-141-2/+2
| * | | | Use Chef::VersionConstraint#to_s in the metadata DSLBrian Cobb2014-07-141-19/+14
| * | | | Version constraints only show patch level if one is givenBrian Cobb2014-07-142-2/+30
* | | | | Merge pull request #1616 from chr4/userdel-forceClaire McQuin2014-08-074-1/+24
|\ \ \ \ \
| * | | | | Add "force" attribute to resource/user, passing "-f" to userdelChris Aumann2014-07-084-1/+24
* | | | | | Merge pull request #1597 from criteo/modify_envClaire McQuin2014-08-072-1/+20
|\ \ \ \ \ \
| * | | | | | Don't modify variable passed to env resource when updatingPierre Ynard2014-07-022-1/+20
* | | | | | | Merge pull request #1591 from onddo/CHEF-5356-gcm-2Claire McQuin2014-08-0711-42/+411
|\ \ \ \ \ \ \
| * | | | | | | [CHEF-5356-gcm] spec/unit/encrypted_data_bag_item_spec.rb: small typo fix, "R...Xabier de Zuazo2014-07-091-1/+1
| * | | | | | | [CHEF-5356-gcm] moved some requires from decryptor.rb to assertions.rbXabier de Zuazo2014-07-092-2/+3
| * | | | | | | [CHEF-5356-gcm] Use rspec filters instead of conditionals and add some altern...Xabier de Zuazo2014-07-093-12/+38
| * | | | | | | [CHEF-5356-gcm] Use OpenSSL::Cipher and OpenSSL::Digest instead of OpenSSL::C...Xabier de Zuazo2014-07-085-15/+15
| * | | | | | | [CHEF-5356-gcm] If the requirements to use Encryted Data Bags 3 are not met, ...Xabier de Zuazo2014-07-065-59/+206
| * | | | | | | [CHEF-5356-gcm] docs updated to clarify ruby 2 requirementXabier de Zuazo2014-07-012-1/+5
| * | | | | | | [CHEF-5356-gcm] Avoid testing GCM with ruby or OpenSSL versionsXabier de Zuazo2014-07-011-2/+5
| * | | | | | | [CHEF-5356-gcm] Chef::Config: Added a comment about EncryptedDataBag version 3Xabier de Zuazo2014-07-011-1/+2
| * | | | | | | [CHEF-5356-gcm] Some small improvements to the EncryptedDataBag unit testsXabier de Zuazo2014-07-011-7/+15
| * | | | | | | [CHEF-5356-gcm] Chef::EncryptedDataBagItem Version3 unit tests addedXabier de Zuazo2014-07-011-0/+55
| * | | | | | | [CHEF-5356-gcm] Chef::EncryptedDataBagItem Version3 implementation using GCMXabier de Zuazo2014-07-014-11/+135
* | | | | | | | Merge pull request #1552 from jordane/fedora-use-systemdClaire McQuin2014-08-071-5/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | use systemd on oracle, scientific 7 tooJordan Evans2014-06-271-2/+8
| * | | | | | | | use systemd for centos 7 tooJordan Evans2014-06-261-1/+4
| * | | | | | | | use systemd for recent fedora and rhel 7Jordan Evans2014-06-251-2/+8
* | | | | | | | | Merge pull request #1527 from opscode/ryancragun/OC-11667Claire McQuin2014-08-072-0/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [OC-11667] Don't overwrite the :default provider map if :default is passed as...Ryan Cragun2014-06-192-0/+12
* | | | | | | | | | Merge pull request #1177 from xeron/CHEF-3399Claire McQuin2014-08-073-24/+114
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [CHEF-3399] Tests: check data_bag_path instead of @paths.Ivan Larionov2014-06-011-1/+1
| * | | | | | | | | | [CHEF-3399] Raise in case of data bag items conflict. Tests.Ivan Larionov2014-05-313-10/+59
| * | | | | | | | | | [CHEF-3399] Use first seen data bag (do not overwrite). Tests.Ivan Larionov2014-05-312-7/+13
| * | | | | | | | | | [CHEF-3399] better place for stub helpersIvan Larionov2014-05-311-8/+8
| * | | | | | | | | | [CHEF-3399] data bag solo tests cleanupIvan Larionov2014-05-311-8/+16
| * | | | | | | | | | [CHEF-3399] Make data_bag_path an array like cookbook_pathIvan Larionov2014-05-312-23/+50
* | | | | | | | | | | Merge branch 'master' of github.com:opscode/chefClaire McQuin2014-08-074-9/+63
|\ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status