Merge branch 'stable' into devel

Browse Source

* stable:
  Update 3.0 changelogs
  Spacing in sh script on merge conflict
  Update setup for bundled ansible-2 dependencies
  fix ansible2.0 bundle deps bootstrap
  Use yum's compare_providers() function instead of just pulling the latest alphabetically.

...

This commit is contained in:

Matthew Jones 2016-07-21 10:49:50 -04:00

parent 7b1fd964e3 3ab8a93461

commit 1208450f59

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available