[chef-dev] 12/15 Developers Office Hours

[Bryan McLellan < >]

Merge:
  Chef #2398 - Add --lockfile opt for chef-client and chef-solo
  Chef #2166 - Add display_name handling to
Chef::ChefFS::DataHandler::UserDataHandler

Reviewed:
  Chef #2288 - Enable logon-as-service in windows_service (CHEF-4921).
  Chef #1026 - CHEF-4591: Knife commands to manipulate env_run_list on nodes
  Ohai #442 - Support IBM System z s390 cpu
  Ohai #441 - Add additional information on the PHP engine versions to
PHP plugin
  Ohai #439 - Fix connection detection logic.

-- 
Bryan McLellan | chef | software engineer
(c) 206.607.7108 | (t) @btmspox | (www) http://getchef.com