summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Improve validation for proxy in http_client_buildernls/proxy-bugNathan L Smith2015-12-282-8/+52
* Merge pull request #4333 from chef/vaultMatt Wrock2015-12-228-53/+82
|\
| * no longer wait on node search to refresh vault but pass created ApiClient ins...Matt Wrock2015-12-228-53/+82
* | Merge pull request #4335 from jaymzh/pr4078changelogPhil Dibowitz2015-12-211-0/+2
|\ \
| * | Changelog for PR#4078Phil Dibowitz2015-12-211-0/+2
|/ /
* | Merge pull request #4078 from natewalck/profilesPhil Dibowitz2015-12-208-0/+660
|\ \ | |/ |/|
| * Added profile provider for OS XNate Walck2015-12-178-0/+660
* | Merge pull request #4330 from chef/shain/disable_aix_mount_testsSalim Alam2015-12-184-3/+9
|\ \
| * | Filter out service test that cannot run inside a WPARshain/disable_aix_mount_testsScott Hain2015-12-183-2/+7
| * | Disabled mount tests on AIX since they only work in LPARs and we test in WPAR...Scott Hain2015-12-181-1/+2
* | | Merge pull request #4327 from chef/jdm/aix-watJay Mundrawala2015-12-181-1/+3
|\ \ \ | |/ / |/| |
| * | Consistent return value for started?Jay Mundrawala2015-12-181-0/+1
| * | tiny_server should retry Errno::EHOSTUNREACHJay Mundrawala2015-12-181-1/+2
|/ /
* | Merge pull request #4325 from chef/ksubrama/win32eventlogJay Mundrawala2015-12-171-1/+4
|\ \ | |/ |/|
| * Pin win32-eventlog to 0.6.3 to avoid clashing CreateEvent definitionKartik Null Cating-Subramanian2015-12-171-1/+4
|/
* Merge pull request #4320 from chef/jk/fix-package-nil-warningJay Mundrawala2015-12-161-5/+1
|\
| * Fix failing package unit testjk/fix-package-nil-warningJohn Keiser2015-12-161-5/+1
* | Merge pull request #4312 from chef/cwebberOps/omnitruckThom May2015-12-161-1/+1
|\ \
| * | Updates the template to use omnitruck-direct.chef.iocwebberOps/omnitruckChristopher Webber2015-12-151-1/+1
* | | Merge pull request #4277 from chef/mwrock/packageMatt Wrock2015-12-159-33/+72
|\ \ \
| * | | fixing post merge test breaksMatt Wrock2015-12-152-3/+3
| * | | merge cleanupmwrock/packageMatt Wrock2015-12-152-2/+6
| * | | non msi packages must explicitly provide a source attribute on installMatt Wrock2015-12-158-28/+63
| | |/ | |/|
* | | Fix a typo comment. [ci skip]Noah Kantrowitz2015-12-151-1/+1
* | | Merge branch 'cd/policies-cheffs'John Keiser2015-12-1543-196/+1097
|\ \ \ | |/ / |/| |
| * | Don't include a github source; kitchen-tests don't have gitcd/policies-cheffsJohn Keiser2015-12-152-4/+2
| * | Make sure we're using chef-zero 4.4.0 which has policyfile route support.Chris Doherty2015-12-151-1/+1
| * | If /policies and /policy_groups are not on this server version,John Keiser2015-12-152-2/+57
| * | Don't feed policies to older versions of chef-zeroJohn Keiser2015-12-151-1/+8
| * | Add knife/ChefFS support for policyfiles and policy_groups.John Keiser2015-12-1542-191/+1032
|/ /
* | Use properties in package resourcesjk/package-propertiesJohn Keiser2015-12-1533-319/+75
* | Don't run IPv6 tests on GCEjk/no-ipv6-on-gceJohn Keiser2015-12-154-3/+14
|/
* Merge pull request #4309 from chef/lcg/fix-tags-and-set-unlessThom May2015-12-154-7/+30
|\
| * really always return an Arraylcg/fix-tags-and-set-unlessLamont Granquist2015-12-142-2/+13
| * tags always an array; fix set_unlessLamont Granquist2015-12-144-6/+18
* | Only warn about potentially duplicate properties during the resource initializerjk/reduce-property-dup-warningJohn Keiser2015-12-144-12/+53
* | Merge pull request #4278 from chef/lcg/file-resource-propertiesLamont Granquist2015-12-145-98/+24
|\ \
| * | add md filelcg/file-resource-propertiesLamont Granquist2015-12-141-0/+4
| * | sort propertiesLamont Granquist2015-12-141-3/+3
| * | fix typoLamont Granquist2015-12-141-1/+1
| * | mocking the filesystem is dumbLamont Granquist2015-12-141-0/+1
| * | fix mocksplosion removal on the windows sideLamont Granquist2015-12-141-4/+4
| * | remove unnecessary identity_attr declarationLamont Granquist2015-12-141-2/+0
| * | regex works fine inside the is arrayLamont Granquist2015-12-141-1/+1
| * | can be less verbose about creating ArraysLamont Granquist2015-12-141-1/+1
| * | why is 'identity' different than 'name_property'?Lamont Granquist2015-12-142-2/+2
| * | is: vs. regex: is differentLamont Granquist2015-12-141-1/+1
| * | stop mutating the default arrayLamont Granquist2015-12-141-1/+1
| * | unnecessary array argLamont Granquist2015-12-141-1/+1
| * | delete commented out lines in spec testLamont Granquist2015-12-141-10/+0