diff options
| author | sersut <serdar@opscode.com> | 2013-10-18 13:50:39 -0700 |
|---|---|---|
| committer | sersut <serdar@opscode.com> | 2013-10-18 13:50:39 -0700 |
| commit | 58d9699f38be2357f49f0d61dcc13895dedc765c (patch) | |
| tree | 3e837440e034acc1298ebd23f395203fa6f1f469 /spec/unit | |
| parent | 7f2865961d4c0c1189ba4ff941879cce6bd755bc (diff) | |
| parent | 2354aba83c6d62c41bfa644c3e35d5d22e4b4578 (diff) | |
| download | chef-58d9699f38be2357f49f0d61dcc13895dedc765c.tar.gz | |
Merge branch '11-stable'
This merge doesn't bring in the version number change which should be different on master.
Conflicts:
distro/common/man/man8/chef-expander.8
distro/common/man/man8/chef-expanderctl.8
distro/common/man/man8/chef-server-webui.8
distro/common/man/man8/chef-server.8
distro/common/man/man8/chef-solr.8
Diffstat (limited to 'spec/unit')
0 files changed, 0 insertions, 0 deletions