valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
67,148 Commits 24 Branches 182 Tags 341 MiB
48a787bdb0
Commit Graph

5687 Commits

Author SHA1 Message Date
rallytime
73d73e80c1 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/topics/releases/2015.8.4.rst
  - doc/topics/releases/2015.8.5.rst
  - doc/topics/thorium/index.rst
  - salt/cloud/clouds/opennebula.py
  - salt/engines/thorium.py
  - salt/loader.py
  - salt/modules/archive.py
  - salt/modules/boto_vpc.py
  - salt/modules/data.py
  - salt/modules/reg.py
  - salt/pillar/mysql.py
  - salt/runners/cache.py
  - salt/states/archive.py
  - salt/states/cron.py
  - salt/states/file.py
  - salt/states/glance.py
  - salt/states/reg.py
  - salt/thorium/__init__.py
  - salt/thorium/check.py
  - salt/thorium/file.py
  - salt/thorium/reg.py
  - salt/utils/jid.py
  - salt/utils/parsers.py
  - setup.py
 2016-02-12 14:38:50 -07:00
Colton Myers
52bc740399 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-2016.3 
Conflicts:
    salt/cloud/clouds/libcloud_aws.py
    salt/cloud/clouds/opennebula.py
 2016-02-11 22:38:12 -07:00
Colton Myers
076b49a4ca Merge remote-tracking branch 'upstream/2015.8' into merge-forward-2016.3 
Conflicts:
    README.rst
    doc/conf.py
    doc/ref/index.rst
    doc/ref/proxy/all/salt.proxy.ssh_sample.rst
    doc/topics/installation/rhel.rst
    doc/topics/releases/2015.8.4.rst
    doc/topics/tutorials/states_pt5.rst
    salt/cloud/clouds/ec2.py
    salt/cloud/clouds/opennebula.py
    salt/config/__init__.py
    salt/modules/boto_dynamodb.py
    salt/modules/boto_ec2.py
    salt/modules/boto_elasticache.py
    salt/modules/boto_elb.py
    salt/modules/boto_iam.py
    salt/modules/boto_rds.py
    salt/modules/boto_sns.py
    salt/modules/boto_sqs.py
    salt/modules/dracr.py
    salt/modules/git.py
    salt/modules/mine.py
    salt/modules/systemd.py
    salt/modules/win_pkg.py
    salt/modules/yumpkg.py
    salt/pillar/__init__.py
    salt/states/git.py
    salt/states/rabbitmq_vhost.py
    salt/states/saltmod.py
    salt/utils/pkg/rpm.py
    setup.py
    tests/unit/modules/systemd_test.py
    tests/unit/states/rabbitmq_vhost_test.py
 2016-02-11 22:33:49 -07:00
Justin Findlay
b58783b895 add 2015.8.7 release notes 2016-02-11 17:04:34 -07:00
twangboy
ee3d70a37d Add release notes 
Also fixed some deprecation stuff that got lost in all the
rebasing and stuff
 2016-02-11 15:09:56 -07:00
justinta89
f493423fbd Updated doc for clarity 2016-02-11 11:25:44 -07:00
justinta89
db7136235a Updated release doc with deprecations. 2016-02-11 11:25:44 -07:00
Mike Place
e76e472978 Include change on loadavg beacon in release notes 2016-02-11 09:42:45 -07:00
rallytime
742d0a6b04 Change all relevant Boron references to 2016.3.0 
And more Boron deprecation warnings to Carbon
 2016-02-10 15:45:28 -07:00
Mike Place
efe47eb7e1 Merge pull request #30917 from rallytime/remove-botocore-aws-driver 
Remove deprecated botocore_aws driver in Boron release
 2016-02-10 12:07:14 -07:00
Mike Place
313b82a0ab Merge pull request #30947 from rallytime/remove-libcloud-aws-driver 
Remove deprecated libcloud_aws driver in Boron release
 2016-02-10 12:01:57 -07:00
Mike Place
21997ea264 Merge pull request #31063 from zmalone/develop 
Fixing typos,
 2016-02-10 11:06:24 -07:00
Marno van der Molen
76b6b5189c Fix documentation for cores_per_socket 2016-02-10 14:13:32 +01:00
Marno van der Molen
cf70f06ade add support for numCoresPerSocket parameter in vmware driver 2016-02-10 14:09:51 +01:00
Denys Havrysh
6370ddda9f Update RHEL installation guide 2016-02-10 09:57:17 +02:00
Zach Malone
271c44667d Fixing typos, many examples in here still don't work (ex. salt -t 15 '*' gpg.create_key throws errors), but some low hanging fruit is fixed. 2016-02-09 15:44:51 -07:00
Denys Havrysh
afdaefbf3d Add systemctl examples for RHEL 7 to the installation guide 2016-02-09 14:48:26 +02:00
Denys Havrysh
069a661eb1 Correct ZeroMQ4 repo install guide for RHEL 2016-02-09 14:33:18 +02:00
Denys Havrysh
d2a9d67b5b Update installation instruction for community repos on RHEL 2016-02-09 13:57:58 +02:00
Andrew Pashkin
1f0c7496fc Specify usage of lookup key in formulas pillars 2016-02-09 13:41:35 +03:00
Denys Havrysh
bbdf2523c8 Add workaround for RHEL 7 systems mentioned in the issue #29094 2016-02-09 12:32:57 +02:00
Mike Place
5b0c7649c7 Merge pull request #30945 from cachedout/note_pillar_cli 
Note that pillar cli args are sent via pub
 2016-02-08 11:43:59 -07:00
rallytime
33eb6ba125 Remove overstate docs and a few references. 
The overstate system was deprecated and removed in Beryllium, in
favor of orchestrate.
 2016-02-08 09:28:32 -07:00
rallytime
66386857f1 Remove libcloud_aws reference from doc/.tx/config 2016-02-05 11:23:14 -07:00
rallytime
cf5f95263a Remove botocore_aws reference in doc/.tx/config file 2016-02-05 11:22:09 -07:00
rallytime
9f55ca34a3 Remove doc references, too! 2016-02-05 11:17:22 -07:00
rallytime
8577a4f528 Remove deprecated libcloud_aws driver in Boron release 2016-02-05 11:13:10 -07:00
Mike Place
3ff7d49555 Note that pillar cli args are sent via pub 2016-02-05 10:54:16 -07:00
Jacob Hammons
fbb7605366 2015.8.5 release notes linking and clean up 2016-02-05 10:39:24 -07:00
Jacob Hammons
57c1ec637a Rev latest version to 2015.8.5 2016-02-04 18:20:04 -07:00
Jacob Hammons
61ad242a89 Updated latest release to 2015.8.5, added a partial list of new modules and features to boron release notes 2016-02-04 18:16:01 -07:00
Jacob Hammons
93d47f8615 Versioned to 2015.8.5, added known issue #30300 to release notes 2016-02-04 18:10:59 -07:00
Mike Place
4372851ad9 Merge pull request #30895 from bdrung/2015.8 
Fix various typos
 2016-02-04 13:55:10 -07:00
Denys Havrysh
936c1ff6c8 Add explanation about N@ classifier. Inspired by #25292 2016-02-04 14:06:41 +02:00
Benjamin Drung
708f2ff8ea Fix typo reponse -> response 2016-02-04 13:06:04 +01:00
Benjamin Drung
72c4eab6d7 Fix typo propogate -> propagate 2016-02-04 13:04:27 +01:00
Benjamin Drung
4912e365cb Fix typo directores -> directories 2016-02-04 13:03:12 +01:00
Benjamin Drung
74c8aba03e Fix typo exeption -> exception 2016-02-04 13:01:41 +01:00
Benjamin Drung
4692d84b07 Fix typos of improvement 2016-02-04 13:00:25 +01:00
Benjamin Drung
213fc2d858 Fix typo occuring -> occurring 2016-02-04 12:59:07 +01:00
Denys Havrysh
8bc2426816 Update example in master config documentation reference 2016-02-04 13:58:41 +02:00
Benjamin Drung
fe6124003b Fix typo nonexistant -> nonexistent 2016-02-04 12:58:20 +01:00
Benjamin Drung
56ce7479b1 Fix typo catched -> caught 2016-02-04 12:57:20 +01:00
Benjamin Drung
821e690e65 Fix typo develoment -> development 2016-02-04 12:56:14 +01:00
Benjamin Drung
b51279e086 Fix typo overide -> override 2016-02-04 12:55:35 +01:00
Benjamin Drung
4f2f04ea7d Fix typo relevent -> relevant 2016-02-04 12:54:45 +01:00
Benjamin Drung
bf92c3663b Fix typo formating -> formatting 2016-02-04 12:45:19 +01:00
Benjamin Drung
cd72b12161 Fix typo thats -> that's 2016-02-04 12:39:41 +01:00
Benjamin Drung
6db9724ec7 Fix typo doesnt -> doesn't 2016-02-04 12:38:29 +01:00
Benjamin Drung
58d46a7e98 Fix typo certficate -> certificate 2016-02-04 12:34:50 +01:00
Thomas S Hatch
715d3e274f clarify that this is not final for this release 2016-02-03 21:20:25 -07:00
Thomas S Hatch
5e5ced1c66 add initial thorium docs 2016-02-03 18:34:17 -07:00
Mike Place
b6d952cff6 Merge pull request #30880 from jfindlay/VMware 
VMWare -> VMware
 2016-02-03 15:50:58 -07:00
Thomas S Hatch
03a890429f Merge pull request #30876 from cachedout/fixup_30830 
Fixup 30830
 2016-02-03 14:59:30 -07:00
Justin Findlay
b41850d9ed add release note about VMWare -> VMware 2016-02-03 14:54:11 -07:00
Justin Findlay
543f0ca712 doc, conf, pkg: VMWare -> VMware 2016-02-03 14:27:28 -07:00
Colton Myers
984ad7ea8b Add documentation for whitelist 2016-02-03 12:29:11 -07:00
Colton Myers
0c8e57852b Add minion_blackout documentation 2016-02-03 12:13:15 -07:00
Denys Havrysh
6648fd4c62 Correct links to Fedora COPR repositories 2016-02-03 14:38:50 +02:00
Denys Havrysh
083037fccc Remove duplicate post-installation tasks section 2016-02-03 14:29:25 +02:00
jacobhammons
f1cf027308 Merge pull request #30841 from jacobhammons/release-notes 
Release notes for 2015.8.5
 2016-02-02 17:04:04 -07:00
Jacob Hammons
6d0562ef86 Release notes for 2015.8.5 2016-02-02 17:02:50 -07:00
Jacob Hammons
ea520fd848 Added known issue #30820 to 2015.8.4 release notes 2016-02-02 15:37:17 -07:00
jacobhammons
e0901854ce Merge pull request #30837 from jacobhammons/release-notes 
Added known issue #30820 to release notes
 2016-02-02 15:33:43 -07:00
Jacob Hammons
29e12a7fef Added known issue #30820 to release notes 2016-02-02 15:32:27 -07:00
Mike Place
b512c7757a Merge pull request #30832 from rallytime/fix-28790 
Add grains modules to salt modindex
 2016-02-02 14:47:46 -07:00
rallytime
ca044dd201 Add grains modules to salt modindex 
Fixes #28790
 2016-02-02 13:35:49 -07:00
Mike Place
bc0ffa840f Merge pull request #30825 from rallytime/doc-fixes 
Fix some autodoc import warnings from building docs
 2016-02-02 13:21:08 -07:00
Jacob Hammons
c95bb60148 Version to 2015.8.4 2016-02-02 13:05:42 -07:00
Jacob Hammons
fca119fe80 Updated man pages, version to 2015.8.4, added CVE 2016-1866 to release notes 2016-02-02 13:04:34 -07:00
jacobhammons
d24b9f1ea1 Merge pull request #30827 from jacobhammons/release-2015.8 
Version to 2015.8.4, added CVE 2016-1866 to release notes
 2016-02-02 13:03:31 -07:00
Thomas S Hatch
4ed5ba08b2 add initial thorium docs 2016-02-02 13:03:30 -07:00
Jacob Hammons
dfc1f7a57d Version to 2015.8.4, added CVE 2016-1866 to release notes 2016-02-02 13:02:19 -07:00
rallytime
cdc7957808 Fix some autodoc import warnings from building docs 2016-02-02 12:19:38 -07:00
rallytime
6375aa2be3 Add new dimension data to doc list 2016-02-02 09:00:01 -07:00
Nicole Thomas
6ad59e78c5 Merge pull request #30767 from tonybaloney/feature/dimension_data_cloud 
Add saltcloud module for Dimension Data Cloud
 2016-02-02 08:55:34 -07:00
anthony-shaw
a61e7fbef3 Documentation for the driver 2016-02-02 14:20:08 +11:00
twangboy
fe0747c14e Fix another typo 2016-02-01 18:38:59 -07:00
twangboy
2815efc522 Fixes spelling 2016-02-01 18:36:23 -07:00
twangboy
6027e1ec53 Updates documentation to reflect new features 2016-02-01 18:32:56 -07:00
Mike Place
d9bf97fb16 Merge pull request #30793 from jacobhammons/release-2015.5 
Versioned latest release to 2015.8.4
 2016-02-01 14:52:43 -07:00
Jacob Hammons
c41e6bf981 Versioned latest release to 2015.8.4 2016-02-01 14:13:08 -07:00
Jacob Hammons
b192a9ba38 Doc restructuring, organization, and cleanup. Updated the doc navigation. 2016-01-31 20:10:02 -07:00
Thomas S Hatch
9e8af2f994 Merge pull request #30686 from cachedout/pillar_cache_2015_8 
Master-side pillar caching
 2016-01-31 11:52:47 -07:00
Colton Myers
967e862027 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/loader.py
    salt/modules/npm.py
    salt/pillar/__init__.py
 2016-01-29 15:51:52 -07:00
Jorge Schrauwen
d003d3c5b3 add missing docs for mdata 2016-01-29 16:25:51 +00:00
rallytime
86c3f2016e Fix-up autodoc proxy modules for consistency 
And to make sure everything is displayed in the module index
 2016-01-28 12:33:07 -07:00
Mike Place
02d8ff626a Pillar cache for master 
Entry point for pillar cache

Working msgpack implementation along with in-memory

Remove debugging

Perms for pillar cache creation

Documentation and small typo fix

Additional documentation note in master config

A note on pillar caching in the documentation on scaling

Backport of pillar cache to 2015.8 branch

Fixed ext pillar with debug

Lint
 2016-01-28 09:44:29 -06:00
Colton Myers
9b28b09fde Merge pull request #30634 from MorphBonehunter/develop 
Renaming salt-ssh option and documentation fix
 2016-01-27 16:50:11 -07:00
Colton Myers
0ee078eaf1 Merge pull request #30647 from terminalmage/issue11304 
Allow custom types to sync to the master
 2016-01-27 15:35:01 -07:00
Colton Myers
c15999edd9 Merge pull request #30428 from davisj/pillar_cache 
Add pillar_cache functionality to minion.
 2016-01-27 14:28:08 -07:00
Erik Johnson
1aa7c611c8 Add additional clarification re: saltutil runner to boron release notes 2016-01-27 15:10:06 -06:00
Clark Perkins
bfec052e7d Added some extra documentation 2016-01-27 11:45:22 -06:00
Erik Johnson
5b48362adb Improve docstrings and instructions on how to sync 
This also removes an unused argument from salt.modules.saltutil.sync_sdb().
 2016-01-26 17:48:12 -06:00
rallytime
4fa80f2d5e Merge branch '2015.8' into 'develop' 
Conflicts:
  - doc/ref/states/all/index.rst
  - salt/cloud/__init__.py
  - salt/minion.py
  - salt/modules/file.py
  - salt/modules/guestfs.py
  - salt/modules/ipmi.py
  - salt/modules/osquery.py
  - salt/modules/parted.py
  - salt/modules/seed.py
  - salt/modules/virt.py
  - salt/modules/yumpkg.py
  - salt/modules/zypper.py
  - salt/states/boto_elb.py
  - salt/states/pkg.py
 2016-01-26 16:19:39 -07:00
Erik Johnson
adaf3625c2 Add extension_modules change to Boron release notes 2016-01-26 14:41:39 -06:00
Erik Johnson
dcf5ed6369 Add information about change to extention_modules 2016-01-26 14:41:39 -06:00
Erik Johnson
c93b693f4c Add saltutil runner to docs toctree 2016-01-26 14:41:39 -06:00
Jake Davis
1b96a3e7e4 Merge branch 'develop' of https://github.com/saltstack/salt into pillar_cache 2016-01-26 13:43:00 -05:00
Jake Davis
4cbf49d487 Rename 'pillar_cache' as 'minion_pillar_cache.' 2016-01-26 10:14:35 -05:00
Daniel Wendler
e38f1fba3f Renaming salt-ssh option and documentation fix 
For consistency the wipe_ssh option is renamed in ssh_wipe as all other
options in the salt-ssh command are in this style.
The documentation was also adjusted to reflect the renaming.
There were also an wrong salt-ssh example in the documentation.
 2016-01-26 08:36:13 +01:00
Colton Myers
330ea9a292 Merge pull request #30622 from rallytime/fix-30621 
Add glance state to list of state modules
 2016-01-25 16:55:54 -07:00
Justin Findlay
b5e2cff028 doc.topics.eauth: clarify client_acl vs eauth 
Fixes #30587.
 2016-01-25 14:32:34 -07:00
rallytime
57b7e6cc93 Add glance state to list of state modules 
Fixes #30621
 2016-01-25 12:35:19 -07:00
Nicole Thomas
653292ec88 Merge pull request #30555 from twangboy/mac_brew 
renamed brew.py to mac_brew.py
 2016-01-25 12:30:31 -07:00
twangboy
9280603549 Updated release notes for boron to reflect filename changes 2016-01-25 11:32:57 -07:00
Nicole Thomas
05349071dc Merge pull request #30503 from StackPointCloud/profitbricks-cloud-provider 
Adds cloud provider support for ProfitBricks
 2016-01-25 11:28:41 -07:00
Justin Findlay
e4043403e4 add 2015.8.4 release notes 2016-01-25 11:10:07 -07:00
Ethan Devenport
de7d1666f6 Updates made after PR review: 
* Improved and cleaned up documentation.
* Removed unnecessary namespaces.
* Made to fail when no ssh_host is found.
* Cleared pylint violations.
 2016-01-25 18:02:10 +00:00
Nicole Thomas
89b4f3de1b Merge pull request #30609 from seanjnkns/backport_30602 
Fix documentation for pillar_merge_lists which default is False, not …
 2016-01-25 10:15:45 -07:00
Nicole Thomas
eb771585f9 Merge pull request #30602 from seanjnkns/pillar_merge_lists-doc-bug 
Fix documentation for pillar_merge_lists which default is False, not …
 2016-01-25 09:54:52 -07:00
Nicole Thomas
afdbb745c6 Merge pull request #30581 from JacobCWard/develop 
Fixes #30569
 2016-01-25 09:36:03 -07:00
Nicole Thomas
a7ba2df5e2 Merge pull request #30589 from terminalmage/2015.5-2015.8 
Merge 2015.5 into 2015.8
 2016-01-25 09:20:41 -07:00
Sean Jenkins
9924acdc43 Fix documentation for pillar_merge_lists which default is False, not True. From PR #30062 2016-01-25 08:57:39 -07:00
Sean Jenkins
841192ee2d Fix documentation for pillar_merge_lists which default is False, not True. From PR #30062 2016-01-25 08:49:13 -07:00
Nicole Thomas
09f9f78d94 Merge pull request #30534 from rmohr/copr 
COPR project moved
 2016-01-25 08:39:34 -07:00
Jonathan Ballet
4062c63b9f Fix doc formatting for yaml_idiosyncrasies 2016-01-25 12:26:30 +01:00
Jonathan Ballet
a329adfb21 Add missing salt.queues.* documentation 2016-01-25 12:19:21 +01:00
Jonathan Ballet
2465cf4ba5 Remove non-existing documentation 
This removes warnings during the documentation compilation
 2016-01-25 12:19:21 +01:00
Jonathan Ballet
276eb3a843 Fix GCE documentation 2016-01-25 12:19:21 +01:00
Erik Johnson
d649551fbf Merge branch '2015.5' into 2015.5-2015.8 2016-01-24 11:55:09 -06:00
Roman Mohr
044fe44ae9 COPR project moved 
Replace old url http://copr.fedoraproject.org with
https://copr.fedorainfracloud.org to fix broken bootstrap script.
 2016-01-24 18:43:02 +01:00
Jacob Ward
40d9e6f505 Fixes #30569 2016-01-23 16:47:40 -07:00
Colton Myers
9885976ac3 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/ref/modules/all/salt.modules.yumpkg.rst
    salt/modules/yumpkg.py
 2016-01-22 12:59:54 -07:00
Jacob Hammons
03c51bb54d Added placeholder release notes for 2015.5.10 
Changed old doc links from docs.saltstack.org to docs.saltstack.com
 2016-01-22 10:48:08 -07:00
Mike Place
05d05263ab Merge pull request #30532 from whiteinge/slsutil-mod 
Add execution module for working in sls files
 2016-01-22 10:25:16 -07:00
Seth House
a57d9984e4 Add slsutil to doc index 2016-01-22 09:45:45 -07:00
Andrew Colin Kissa
806823315e Add postgres_initdb state module documentation 2016-01-22 12:21:03 +02:00
Erik Johnson
a118eb5d2e Merge branch '2015.5' into 2015.5-2015.8 2016-01-22 01:20:27 -06:00
Colton Myers
cb8bf91944 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/ref/configuration/master.rst
    doc/topics/cloud/linode.rst
    salt/cloud/clouds/linode.py
    salt/modules/rh_ip.py
    salt/renderers/pyobjects.py
    salt/states/file.py
 2016-01-21 17:42:50 -07:00
Mike Place
587a03e1d8 Merge pull request #30466 from s0undt3ch/hotfix/stop-deprecating-and-fix-opts-id 
Stop the deprecation path started in 0.17 about ext_pillar
 2016-01-21 15:58:36 -07:00
Mike Place
359b5267ac Merge pull request #30509 from abednarik/dependencies_doc_update 
Updated dependencies documentation.
 2016-01-21 15:54:31 -07:00
Mike Place
15c7aedd46 Merge pull request #30508 from rallytime/linode-clone-fixes 
Fix Linode driver cloning functionality
 2016-01-21 15:53:36 -07:00
Ethan Devenport
44491f69cf Adds cloud provider support for ProfitBricks Cloud Computing Infrastructure Services. 2016-01-21 22:52:25 +00:00
Jorge Schrauwen
2ad5fc1a75 enable doc generation for solaris_system 2016-01-21 19:40:44 +00:00
abednarik
4f8de47723 Updated dependencies documentation. 
Added tornado and futures in Quick Install and Installing Salt for Development
sections.

Fixes #30467
 2016-01-21 14:43:00 -03:00
rallytime
d26ed74bde Make sure the correct profile parameters are being checked when cloning 2016-01-21 10:29:48 -07:00
Erik Johnson
330e26d1da Hide get_locked_packages 2016-01-21 09:56:13 -06:00
Jake Davis
60f7e3ea01 Fixed chmod lint issue. Added notices about security implications. 2016-01-21 10:39:31 -05:00
Jake Davis
616e9c3f2b Add pillar_cache functionality to minion. 
Allows minon to save rendered pillar data to cachedir for later use
when file_client is set to local.
 2016-01-21 10:39:31 -05:00
Pedro Algarvio
bf7ce7c098 Stop the deprecation path started in 0.17 about ext_pillar 
The ``ext_pillar`` functions **must** now accept a minion ID as the first argument.
This stops the deprecation path started in Salt 0.17.x. Before this minion ID first argument was introduced, the minion ID could be retrieved accessing ``__opts__['id']`` loosing the reference to the master ID initially set in opts.
This is no longer the case, ``__opts__['id']`` will be kept as the master ID.
 2016-01-21 14:33:23 +00:00
rallytime
1d7e229377 Fix Linode driver cloning functionality. 
Fixes #30432
Fixes #30444

- Various clean-up of the driver, particularly in the create function.
- Restores cloning functionality, as this was completely broken in 2015.8.3
- Changes the requirement to set a config_id for cloned VMs (not necessary
for clones as the config_id is already set via the to-be-cloned profile)
- Updates docs to use the -F bootstrap script arg in addition to -C when
cloning from a VM that already has salt installed on it.
 2016-01-20 17:05:20 -07:00
Mike Place
2b7d20cee7 Merge pull request #30457 from rallytime/fix-22820 
Remove fsutils references from modules list
 2016-01-20 09:43:50 -07:00
Mike Place
73f372dc98 Merge pull request #30458 from rallytime/bp-30062 
Back-port #30062 to 2015.8
 2016-01-20 09:40:22 -07:00
Jacob Hammons
2b7f96bf0e Fixed sphinx build warnings / errors, added autodoc entries for new modules added in Boron 2016-01-19 21:57:45 -07:00
Tim Harper
721c1c871b make note of s3 role assumption in upcoming changelog 2016-01-19 20:38:21 -07:00
Sean Jenkins
9665d9655f Set (pillar_)merge_lists to default for PR#30062 2016-01-19 15:06:50 -07:00
Sean Jenkins
e44a30620b Remove recurse_list from pillar_source_merging_strategy and add pillar_merge_list (bool) instead 2016-01-19 15:06:30 -07:00
rallytime
3288ff104d Remove fsutils references from modules list 
Fixes #22820
 2016-01-19 14:41:02 -07:00
Jacob Hammons
238ccba640 added tornado.netutil and tornado.stack_context to doc mock modules 2016-01-19 14:03:27 -07:00