valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
69,528 Commits 24 Branches 182 Tags 341 MiB
d9962dc1c4
Commit Graph

6012 Commits

Author SHA1 Message Date
Nicole Thomas
ab8b70d985 Merge pull request #32212 from rallytime/bp-32197 
Back-port #32197 to 2015.8
 2016-03-29 09:50:58 -06:00
Nicole Thomas
200d82cc3e Merge pull request #32211 from rallytime/bp-32210 
Back-port #32210 to 2015.8
 2016-03-29 09:50:42 -06:00
Todd Wells
5fdd81ace9 documentation fix issue 31844 2016-03-29 09:11:29 -06:00
Nicole Thomas
dbb95381fb Merge pull request #32210 from rallytime/merge-32193 
Merge #32193 with pylint fix
 2016-03-29 09:10:36 -06:00
Todd Wells
abd432746c documentation-fix-31931 2016-03-29 09:08:58 -06:00
Jacob Hammons
596444e2b4 2015.8.8.2 release notes 
Adds banner notifiying user when they are viewing release notes for an old release
 2016-03-29 06:38:04 -06:00
Todd Wells
d53c10fa72 documentation fix issue 31844 2016-03-28 16:16:04 -07:00
Todd Wells
bfded5c401 documentation-fix-31931 2016-03-28 15:08:44 -07:00
rallytime
40d09c822e Add some "best practices" information to test documentation 
Also clarifies some sections and fixes some broken links.
 2016-03-28 14:23:42 -06:00
rallytime
d684d49490 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/topics/releases/2015.5.10.rst
  - doc/topics/releases/2015.8.8.rst
 2016-03-28 11:16:22 -06:00
rallytime
9adc2facb2 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-03-28 10:57:25 -06:00
Mike Place
63c8bf3542 Merge pull request #32160 from cachedout/issue_31944 
Fix beacon tutorial docs
 2016-03-25 16:32:51 -06:00
Mike Place
104ada5b6f Fix beacon tutorial docs 
Closes #31944
 2016-03-25 16:31:39 -06:00
rallytime
f6d9cdc633 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/ref/states/compiler_ordering.rst
  - doc/topics/installation/suse.rst
  - doc/topics/jobs/schedule.rst
  - doc/topics/targeting/grains.rst
  - doc/topics/tutorials/preseed_key.rst
  - doc/topics/tutorials/states_pt5.rst
  - pkg/suse/use-forking-daemon.patch
  - salt/minion.py
  - salt/modules/pacman.py
  - salt/modules/state.py
  - salt/modules/yumpkg.py
 2016-03-25 11:47:16 -06:00
Mike Place
a09aa18036 Merge pull request #32127 from rallytime/dunder-docs 
Add runners to __salt__ docs
 2016-03-25 09:54:02 -06:00
rallytime
482690ef33 Add note to docs about __salt__ referencing runner modules 2016-03-24 16:35:50 -06:00
rallytime
7554d0f42d Merge branch '2015.5' into '2015.8' 
Conflicts:
  - doc/ref/states/include.rst
  - doc/topics/cloud/reactor.rst
  - doc/topics/reactor/index.rst
  - doc/topics/releases/2015.5.10.rst
  - doc/topics/tutorials/states_pt5.rst
  - doc/topics/windows/windows-package-manager.rst
  - salt/config.py
  - salt/modules/state.py
  - salt/states/grains.py
  - tests/integration/modules/sysmod.py
  - tests/unit/states/grains_test.py
 2016-03-24 15:48:00 -06:00
Jacob Hammons
21eee08842 Added known issues 32004 and 32044 to 2015.8.8 release notes 2016-03-24 13:58:21 -06:00
rallytime
a11d2e413a Add runners to __salt__ docs 2016-03-24 12:25:45 -06:00
Nicole Thomas
c03e8757e3 Merge pull request #32107 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-03-24 11:14:39 -06:00
Mircea Ulinic
7443c0ef0a Tiny doc fix 2016-03-24 11:14:01 +00:00
rallytime
a333210a08 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/conf.py
  - salt/modules/rabbitmq.py
  - salt/states/rabbitmq_user.py
  - tests/unit/states/rabbitmq_user_test.py
 2016-03-23 16:10:31 -06:00
Nicole Thomas
848ce5647f Merge pull request #32096 from rallytime/bp-32065 
Back-port #32065 to 2015.5
 2016-03-23 16:01:36 -06:00
Nicole Thomas
d5bb8f6372 Merge pull request #32098 from rallytime/bp-32083 
Back-port #32083 to 2015.8
 2016-03-23 15:49:01 -06:00
jacobhammons
9b332d48b9 Merge pull request #32104 from jacobhammons/dot10 
One additional known issue for 2015.5.10 release notes
 2016-03-23 15:20:49 -06:00
Jacob Hammons
b9fc882a1e One additional known issue for 2015.5.10 release notes 2016-03-23 15:19:36 -06:00
jacobhammons
518167b41b Merge pull request #32101 from jacobhammons/releases 
Release docs for 2015.8.8 and 2015.5.10
 2016-03-23 14:09:13 -06:00
Jacob Hammons
487edb1924 Release docs for 2015.8.8 and 2015.5.10 2016-03-23 14:08:36 -06:00
jacobhammons
ff51d548e1 Merge pull request #32100 from jacobhammons/dot10 
2015.5.10 release docs
 2016-03-23 14:05:21 -06:00
Jacob Hammons
544a1661ce 2015.5.10 release docs 2016-03-23 14:04:29 -06:00
Jacob Hammons
8ec5d989ad 2015.8.8 release docs 2016-03-23 14:00:30 -06:00
Thomas Güttler
4a3a6629ce "Fire Event Notifications" moved down 
it is less important. "Requisites" is what the page is about.
 2016-03-23 13:57:45 -06:00
TheNullByte
36a9d6a374 Fix an issue with the minion targeting example 
There wasn't the grain selector during the targeting, so the example actually never targets any minions.
 2016-03-23 13:56:17 -06:00
Nicole Thomas
f3872c3da3 Merge pull request #32090 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-03-23 13:51:57 -06:00
Mike Place
7da969aa29 Merge pull request #32060 from guettli/patch-1 
removed "all": pillar is about "particular minion"
 2016-03-23 11:19:44 -06:00
rallytime
55544a84a1 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/minion.py
 2016-03-23 11:04:42 -06:00
rallytime
fa09de7a58 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - tests/unit/states/rabbitmq_user_test.py
 2016-03-23 10:56:25 -06:00
C. R. Oldham
0fd625785c Merge pull request #32055 from mirceaulinic/CF-NTP-STATE 
netntp state: manage NTP peers on network devices
 2016-03-23 10:45:13 -06:00
Thomas Güttler
9bd14c1d3d "Fire Event Notifications" moved down 
it is less important. "Requisites" is what the page is about.
 2016-03-23 17:15:29 +01:00
Nicole Thomas
fc1ba937aa Merge pull request #32065 from TheNullByte/patch-1 
Fix an issue with the minion targeting example in docs
 2016-03-23 09:51:27 -06:00
C. R. Oldham
6a9ec9ce49 Merge pull request #32043 from mirceaulinic/CF-NAPALM-NTP 
New module: NAPALM_NTP, using NAPALM proxy

Merging, test failures are unrelated.

@mirceaulinic Thank you for your contribution.
 2016-03-23 08:54:08 -06:00
Nicole Thomas
c610890041 Merge pull request #32073 from nmadhok/patch-3 
Update vmware.rst
 2016-03-23 08:43:55 -06:00
Nitin Madhok
c5f26fbebb Update vmware.rst 2016-03-22 22:22:31 -04:00
Nitin Madhok
8e319ea52d Update salt.cloud.clouds.vmware.rst 2016-03-22 22:11:15 -04:00
TheNullByte
0b441da399 Fix an issue with the minion targeting example 
There wasn't the grain selector during the targeting, so the example actually never targets any minions.
 2016-03-22 16:47:42 -04:00
Thomas Güttler
4aec2c502d removed "all": pillar is about "particular minion" 2016-03-22 21:16:34 +01:00
Mircea Ulinic
37eee04706 Some doc 2016-03-22 17:47:00 +00:00
Erik Johnson
74ee8c54bc Clarify prior role of state.highstate in states tutorial 2016-03-22 10:58:45 -05:00
Mircea Ulinic
7147c6a42a napalm_ntp salt module 2016-03-22 11:40:12 +00:00
Erik Johnson
1b97e4a3df Improve state module docs, replace references to state.highstate/state.sls with state.apply 
Resolves #32037.
 2016-03-21 22:56:17 -05:00
anthony-shaw
c0aa856946 Document what is in the Dimension Data Cloud support in SaltStack 2016.3 2016-03-22 11:14:26 +11:00
Josh Fraser
26eee1505f There were two identical blocks concerning Windows Deploy Timeouts. This 
pull request removes the extra block of text.
 2016-03-21 09:08:21 -06:00
Josh Fraser
718d6bde11 There were two identical blocks concerning Windows Deploy Timeouts. This 
pull request removes the extra block of text.
 2016-03-20 21:55:29 -07:00
Mike Place
63133ebbb5 Add docs for master_tries 
Refs #31794
 2016-03-20 10:27:16 -06:00
Nicole Thomas
f267b7b6ac Merge pull request #31998 from jacobhammons/mock-imports 
Fixed build errors, additional mock imports, new module docs
 2016-03-19 09:48:06 -06:00
Jacob Hammons
31bb573abc Fixes a doc build exception caused by missing mocks for modules.win_dacl 2016-03-18 17:43:36 -06:00
Jacob Hammons
e48b84c98f Fixed build errors, additional mock imports, new module docs 
Fixes #31975
 2016-03-18 17:37:22 -06:00
rallytime
52111eb01a Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/cloud/clouds/joyent.py
  - salt/minion.py
 2016-03-18 16:00:35 -06:00
rallytime
6360ecd3b3 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cloud/clouds/scaleway.py
  - salt/config/__init__.py
  - salt/log/mixins.py
  - salt/minion.py
  - salt/modules/ps.py
  - salt/utils/decorators/__init__.py
  - salt/utils/schema.py
  - tests/unit/modules/etcd_mod_test.py
  - tests/unit/modules/file_test.py
 2016-03-18 11:26:12 -06:00
rallytime
308aa5fd61 Merge branch '2016.3' into 'develop' 
Conflicts:
  - conf/master
  - conf/minion
  - doc/ref/proxy/all/index.rst
  - salt/cli/daemons.py
  - salt/modules/key.py
  - salt/modules/reg.py
  - salt/modules/win_pkg.py
  - salt/utils/__init__.py
  - salt/utils/cloud.py
  - tests/unit/daemons_test.py
 2016-03-18 10:57:15 -06:00
Bruno P. Kinoshita
fa921e6e8b Fix typo in pillar docs 
Trivial typo, s/pacakges/packages/g
 2016-03-18 10:29:34 +13:00
Justin Findlay
b984659678 update 2015.8.8 release notes 2016-03-17 15:07:10 -06:00
Bruno P. Kinoshita
31a55a786e Typo 
Trivial typo. s/Nodgroups/Nodegroups/g
 2016-03-17 17:51:58 +13:00
rallytime
06dd2c0411 Fix linking syntax in testing docs 2016-03-16 16:43:53 -06:00
Justin Findlay
64dd8aebb2 update 2015.8.8 release notes 2016-03-16 11:49:01 -06:00
Cory Wright
a689755693 Fix bad links/formatting for 2016 release notes 2016-03-16 09:11:28 -04:00
Mike Place
30241f53bc Merge pull request #31910 from cachedout/doc_31832 
Docs for stand-alone minion
 2016-03-15 13:53:31 -06:00
Mike Place
1c2e8e0828 Docs for stand-alone minion 
Refs #31832
 2016-03-15 13:52:09 -06:00
Mike Place
7339f84af1 Merge pull request #31817 from rajvidhimar/enhance-junos 
Enhance junos
 2016-03-15 13:45:40 -06:00
rallytime
1a1ce05186 Merge branch '2015.5' into '2015.8' 
Conflicts:
  - .testing.pylintrc
  - salt/cloud/clouds/joyent.py
 2016-03-15 12:34:57 -06:00
Mike Place
64ca65954a Add docs for master_tries 
Refs #31794
 2016-03-15 09:29:13 -06:00
Jacob Hammons
fd7f7bcddf Updated release notes 
Added a shortcut to link to pull requests
Added doc entries for all new modules
removed the unnecessary :undoc-members: option from recent doc module entries
 2016-03-14 16:34:22 -06:00
rajvidhimar
bfb8a9212c added junos state module and added more functionalities to junos module 2016-03-14 11:41:30 +05:30
Sandor Zeestraten
a1a2229405 Adds missing docs for Azure cloud profile 
Adds documentation for feature introduced in #24559 in salt-cloud
to specify virtual network and subnet in the Azure cloud profile.
 2016-03-13 14:27:49 +01:00
rallytime
54c76ebf33 Merge branch '2015.8' into '2016.3' 2016-03-12 19:12:08 -07:00
rallytime
1470de17fa Merge branch '2014.7' into '2015.5' 2016-03-12 19:08:20 -07:00
Justin Findlay
47ac41ba27 add 2015.8.8 release notes 2016-03-11 16:14:54 -07:00
Justin Findlay
358fdad0c8 add 2014.7.8 release notes 2016-03-11 14:31:51 -07:00
Justin Findlay
6910fcc584 add 2014.7.9 release notes 2016-03-11 14:08:55 -07:00
Daniel Wallace
197fc2b58d Add reactor to engines 
For use with the event bus on minions.

Closes #15265
 2016-03-11 08:34:16 -07:00
Nicole Thomas
8cf0b9eb3d Merge pull request #31810 from whiteinge/saltenv-jinja-var 
Fix outdated Jinja 'env' variable reference
 2016-03-10 20:52:21 -07:00
Seth House
cb72b19240 Fix outdated Jinja 'env' variable reference 2016-03-10 19:48:42 -07:00
rallytime
fe7ff0ebfa Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cloud/__init__.py
  - salt/returners/smtp_return.py
 2016-03-10 13:13:35 -07:00
Nicole Thomas
538ec983f7 Merge pull request #31724 from pakdel/develop 
subnetname and securitygroupname support for EC2
 2016-03-09 16:39:51 -07:00
Nicole Thomas
1d6d982e5c Merge pull request #31752 from rallytime/bp-31686 
Back-port #31686 to 2015.8
 2016-03-09 14:23:00 -07:00
Nicole Thomas
ec90294442 Merge pull request #31733 from jacobhammons/cloud-docs 
docs to clarify cloud configuration
 2016-03-09 13:54:10 -07:00
Jacob Hammons
209c641a41 Made udpates as suggested by @rallytime 2016-03-09 11:00:27 -07:00
Imran Iqbal
e4df5d9a55 Fix typo in example for section winrepo_dir_ng 2016-03-08 13:21:52 -07:00
rallytime
838dc12b77 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cli/daemons.py
  - salt/config/__init__.py
  - salt/exceptions.py
  - salt/pillar/foreman.py
  - salt/returners/local_cache.py
  - salt/states/saltmod.py
  - salt/utils/__init__.py
  - salt/utils/cloud.py

The merge conflicts in salt/cli/daemons.py are still present in this commit.
@s0undt3ch is going to resolve them after this commit.
 2016-03-08 10:14:32 -07:00
Vincas Dargis
26ff46dbc6 Fix parenthesis missmatch in documentation 2016-03-08 10:18:47 +02:00
Jacob Hammons
26d4991cb3 moved previous intro to new quick start topic (topics/cloud/qs.rst) 
added new intro that explains the salt cloud configuration files
added an inheritance and minion startup state example to topics/cloud/config.rst
 2016-03-07 16:06:16 -07:00
rallytime
7476076ea3 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/beacons/memusage.py
 2016-03-07 14:13:14 -07:00
Mike Place
a1f32b71bd Merge pull request #31670 from terminalmage/issue30528 
Write lists of minions targeted by syndic masters to job cache
 2016-03-07 11:51:52 -07:00
Amir Pakdel
4c423eed9d Fixed my documentation mistake 2016-03-07 12:29:48 -05:00
Amir Pakdel
131d3a1911 AWS securitygroupname and subnetname 
Added support for subnetname and securitygroupname for EC2
instances.
Since there can be one subnet assigned to an instance, subnetid
takes precedence over subnetname; but securitygroupid and
securitygroupname are merged together to create a songle
SecurityGroup list.
 2016-03-07 12:25:45 -05:00
rallytime
6559ea15b0 Merge branch '2015.5' into '2015.8' 
Conflicts:
  - doc/glossary.rst
  - salt/config.py
  - tests/unit/modules/gpg_test.py
 2016-03-06 10:59:46 -07:00
Imran Iqbal
1f0b742052 Fix typo in example for section winrepo_dir_ng 2016-03-04 22:19:25 +00:00
Nicole Thomas
27f443895d Merge pull request #31682 from cachedout/cache_meaning 
Add definition of job cache to glossary
 2016-03-04 13:07:19 -07:00
Mike Place
a75e146125 Add definition of job cache to glossary 2016-03-04 12:41:02 -07:00
rallytime
beb9d0fe84 Ensure all integration test classes and funcs are documented w/examples 2016-03-04 12:13:27 -07:00
rallytime
7f8ebf7c97 Found another spelling error 2016-03-04 09:53:35 -07:00
rallytime
c8c188535f Spelling fix 2016-03-04 09:33:37 -07:00
Erik Johnson
0f175a4edf salt.returners.sqlite3_return: add no-op save_minions() func for API compatibility 2016-03-03 21:40:37 -06:00
Erik Johnson
f8664103b1 salt.returners.redis_return: add no-op save_minions() func for API compatibility 2016-03-03 21:40:37 -06:00
Erik Johnson
0ea1b76c22 salt.returners.postgres_local_cache: add no-op save_minions() func for API compatibility 2016-03-03 21:40:37 -06:00
Erik Johnson
d6d794b484 salt.returners.postgres: add no-op save_minions() func for API compatibility 2016-03-03 21:40:37 -06:00
Erik Johnson
82750ab699 salt.returners.pgjsonb: add no-op save_minions() func for API compatibility 2016-03-03 21:40:37 -06:00
Erik Johnson
d8f90f6578 salt.returners.odbc: add no-op save_minions() func for API compatibility 2016-03-03 21:40:37 -06:00
Erik Johnson
a1957c3706 salt.returners.mysql: add no-op save_minions() func for API compatibility 2016-03-03 21:40:37 -06:00
Erik Johnson
ef6aa5de1c salt.returners.multi_returner: add no-op save_minions() func for API compatibility 2016-03-03 21:40:37 -06:00
Erik Johnson
5b4eb58d99 salt.returners.mongo_return: add no-op save_minions() func for API compatibility 2016-03-03 21:40:36 -06:00
Erik Johnson
da1acbb8f2 salt.returners.mongo_future_return: add no-op save_minions() func for API compatibility 2016-03-03 21:40:36 -06:00
Erik Johnson
c13bb6549c salt.returners.memcache_return: add no-op save_minions() func for API compatibility 2016-03-03 21:40:36 -06:00
Erik Johnson
4322ad9ef3 salt.returners.influxdb_return: add no-op save_minions() func for API compatibility 2016-03-03 21:40:36 -06:00
Erik Johnson
1dd106183c salt.returners.etcd_return: add no-op save_minions() func for API compatibility 2016-03-03 21:40:36 -06:00
Erik Johnson
8e80535516 salt.returners.couchdb_return: add no-op save_minions() func for API compatibility 2016-03-03 21:40:36 -06:00
Erik Johnson
44538dfced salt.returners.cassandra_cql_return: add no-op save_minions() func for API compatibility 2016-03-03 21:40:36 -06:00
Erik Johnson
978b6cb32f Add missing RST file for slsutil module 2016-03-03 21:40:36 -06:00
rallytime
f260c51762 Some more testing documentation improvements 2016-03-03 16:57:52 -07:00
Mike Place
bd04c964d1 Merge pull request #31658 from rallytime/add-style-to-contrib 
Add mentioned of Salt's Coding Style docs to the Contributing docs
 2016-03-03 15:14:57 -07:00
Jorge Schrauwen
9aa0f72cad Add some info about massive improvements for SmartOS, illumos, and Solaris 2016-03-03 20:23:38 +00:00
rallytime
6b526b5878 Add mentioned of Salt's Coding Style docs to the Contributing docs 2016-03-03 11:41:46 -07:00
Mike Place
a43e5edc81 Merge pull request #31601 from cro/cfgmgmtcamp 
Proxy fixes for #31585 and #31586
 2016-03-03 11:34:07 -07:00
rallytime
6e0377d376 Make note of pylint dependencies in docs 2016-03-03 10:56:22 -07:00
Mike Place
4d1701de60 Merge pull request #31641 from rallytime/testing-tutorial 
Improve Salt Testing tutorial to be a more comprehensive intro
 2016-03-03 09:08:47 -07:00
rallytime
6ab3961748 Improve Salt Testing tutorial to be a more comprehensive intro 2016-03-02 17:07:57 -07:00
rallytime
2ee175c6d3 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/fileclient.py
  - salt/modules/glusterfs.py
 2016-03-02 13:48:11 -07:00
rallytime
75bb692990 Merge branch '2015.5' into '2015.8' 
No conflicts.
 2016-03-02 12:33:10 -07:00
C. R. Oldham
1ce9d85dd4 Proxy minion release notes. 2016-03-02 11:26:56 -07:00
rallytime
5a862d3449 Add documentation for the behavior change in #31577 
Refs #31577
 2016-03-02 11:03:49 -07:00
rallytime
031a75ca33 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - Contributing.rst
  - conf/master
  - doc/index.rst
  - doc/man/salt.7
  - pkg/suse/README.suse
  - salt/client/ssh/state.py
  - salt/minion.py
  - salt/modules/zypper.py
  - salt/utils/schedule.py
  - tests/unit/modules/zypper_test.py
 2016-03-02 10:26:13 -07:00
Justin Findlay
4e48fec806 doc/topics/tutorials/http: update query decoding docs 
Fixes #31614.
 2016-03-02 10:17:22 -07:00
Denys Havrysh
aebc48163d Remove trailing white spaces in documentation files 2016-03-01 17:36:23 +02:00
rallytime
24505d2dcf Merge branch '2015.5' into '2015.8' 
Conflicts:
  - salt/client/ssh/state.py
  - salt/fileclient.py
  - salt/minion.py
 2016-02-29 10:47:40 -07:00
Mike Place
f2e2e6e3cf Merge pull request #31316 from kraney/kraney_bugfix 
Let ext_pillar_first determine the override order
 2016-02-29 09:09:35 -07:00
Mike Place
95af21325f Merge pull request #31536 from virtrnd/remove-jessie-backports-from-raspbian-install 
Remove debian repo from raspbian installation
 2016-02-29 08:32:52 -07:00
virtualguy
e48900ac55 Use python-tornado from jessie-backports for pure debian 2016-02-29 22:42:15 +13:00
virtualguy
6e338e2601 Remove debian repo from raspbian installation 
Binary packages from stock debain repo (http://httpredir.debian.org/debian) are not armv6 compatible so should not be installed on raspberry pi version 1. Rasbian doesn't have jessie-backports so safer just to install python-tornado from stretch.
 2016-02-29 19:20:51 +13:00
LoveIsGrief
0eba4cdf17 Public documentation for salt-cloud virtualbox 2016-02-28 17:29:02 +01:00
Denys Havrysh
f7beeb69f2 Correct Salt Cloud documentation about updating Salt Bootstrap script 2016-02-27 22:43:07 +02:00
Kris Raney
0aa6334442 Merge branch 'develop' into kraney_bugfix 
Conflicts:
	salt/pillar/__init__.py
 2016-02-26 09:41:09 -06:00
Mike Place
a4482c000f Merge pull request #31492 from m03/add-source_hash-to-win_pkg 
Add source_hash param to win_pkg
 2016-02-26 08:06:27 -07:00
Denys Havrysh
50f3e072b1 Add instruction how to install salt-minion on Debian Jessie from Stretch 2016-02-26 15:10:37 +02:00
Denys Havrysh
abcd505178 Update Debian installation guide with information about Raspbian 2016-02-26 13:30:22 +02:00
rallytime
40cd0ac8fe Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/states/file.py
  - tests/runtests.py
 2016-02-25 16:21:15 -07:00
rallytime
83e6480d20 Remove duplicate "timeout" definition in Roster docs 2016-02-25 14:05:38 -07:00
rallytime
3b74d123af Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/selinux.py
  - salt/modules/zypper.py
  - salt/pillar/__init__.py
  - salt/states/dockerng.py
  - tests/runtests.py
 2016-02-25 12:36:22 -07:00
Morrie Winnett
8690188558 Add source_hash param to win_pkg 
Addresses issues saltstack/salt#14872, saltstack/salt-winrepo#492, and
concerns raised in saltstack/salt#27093 and saltstack/salt#20737.
 2016-02-25 09:47:52 -08:00
Nicole Thomas
cd87760c87 Merge pull request #31485 from jacobhammons/2015.8 
Fixed transport description in minion / master config
 2016-02-25 10:04:15 -07:00
Jacob Hammons
748acab8b5 Fixed zeromq casing in transport settings 2016-02-25 09:38:41 -07:00
Kris Raney
afa297e4d1 Add pillar_roots_override_ext_pillar option and deprecate ext_pillar_first 2016-02-25 10:17:39 -06:00
Mike Place
e483978fc8 Merge pull request #31423 from twangboy/win_system_dev 
Fix uppercase computer names
 2016-02-25 09:15:58 -07:00
Jacob Hammons
765a226907 Fixed transport description in minion / master config 2016-02-25 09:08:54 -07:00
Nicole Thomas
2e9a705e75 Merge pull request #31475 from jacobhammons/2015.8 
Assorted doc issues
 2016-02-25 09:03:54 -07:00
Denys Havrysh
172f34a6ca Correct headers in Debian/Ubuntu/SUSE install instructions 2016-02-25 11:51:40 +02:00
Denys Havrysh
4248f9ea0a Add common packages installation section to Debian install guide 2016-02-25 11:04:11 +02:00
Denys Havrysh
8c6e179870 Add note about amd64 packages to Ubuntu install guide 2016-02-25 11:02:07 +02:00
Denys Havrysh
afaa24723a Update Ubuntu install guide: 
- remove duplicate sections
- add `salt-api` and `salt-cloud` to the example
 2016-02-25 10:24:55 +02:00
Jacob Hammons
a72dc15720 Assorted doc issues 
Fixes #10330
Fixes #31216
Fixes #30464
Fixes #29520
Fixes #30261
Fixes #29636
Fixes #29528
 2016-02-24 16:56:52 -07:00
twangboy
36f63965ed Add release notes. 2016-02-24 11:41:44 -07:00
Jacob Hammons
10bf7c3bdd Fixes #31402 
Added arguments to state `file.line` to fix issue where exe module uses `line` and state module uses `name`.
Reformatted parameters in exe module `file.line`
placeholder release notes for 2015.5.8
 2016-02-24 10:30:34 -07:00
twangboy
eb457b9eb8 Fix typos 2016-02-24 10:15:01 -07:00
twangboy
78535f7306 Fix some formatting issues 2016-02-24 10:08:03 -07:00
twangboy
b0f2d3d9f6 Clarification for Windows Package Manger 
Formatting issues
 2016-02-24 10:08:03 -07:00
Mike Place
aa0a9a03dd Merge pull request #31458 from vutny/correct-doc-install-debian 
Correct installation documentation for Debian
 2016-02-24 10:01:09 -07:00
Denys Havrysh
42aa7eeafd Add section about installation from the Debian Main Repository 2016-02-24 17:48:37 +02:00
Kyle Stapp
87f4843490 Clarified the form of requisite targets/requisite-references 2016-02-24 10:34:03 -05:00
Denys Havrysh
07dece2f8f Remove duplicate post-installation section for Debian install guide 2016-02-24 17:30:51 +02:00
Nicole Thomas
b32dd6d332 Merge pull request #31452 from anandxoriant/develop 
Updated win_organization_name default value for vmware driver
 2016-02-24 08:27:27 -07:00
Denys Havrysh
10c05f6943 Add install section for Debian Stretch (Testing) from community repository 2016-02-24 17:26:20 +02:00
Denys Havrysh
b2c78e08dc Add note about supported Debian architectures on SaltStack corp repo 2016-02-24 17:24:44 +02:00
Anand Nevase
a93c7e2ffa change win_organization_name default value to Organization 2016-02-24 17:34:07 +05:30
Nicole Thomas
8f6c4be618 Merge pull request #31444 from jacobhammons/ddns-docs 
Documentation updates - ddns state, file.line state/exe function, installation dependencies
 2016-02-23 15:40:05 -07:00
Jacob Hammons
0b8fce1de4 Fixes #31402 
Added arguments to state `file.line` to fix issue where exe module uses `line` and state module uses `name`.
Reformatted parameters in exe module `file.line`
placeholder release notes for 2015.5.8
 2016-02-23 14:28:40 -07:00
Mircea Ulinic
8ad5794b60 Proxy Minion for network devices using Napalm library 2016-02-23 17:44:39 +00:00
Mike Place
42027e0d72 Merge pull request #31341 from twangboy/package_manager_docs 
Clarification on Windows Package Manager docs
 2016-02-23 09:09:18 -07:00
Mike Place
f833b6f5b6 Merge pull request #30891 from anandxoriant/develop 
Support for windows VM network (static/dhcp) configuration for vmware driver.
 2016-02-22 17:13:08 -07:00
Mike Place
08edcc0bb7 Merge pull request #31296 from kstreee/saltstack/salt#31194 
[saltstack/salt#31194] Fix issue of running multiple salt-api instances.
 2016-02-22 16:05:13 -07:00
twangboy
c16cfc6360 Fix typos 2016-02-22 14:15:49 -07:00
Anand Nevase
12a0c76448 Updated Windows Fullname and Organization for vmware driver 2016-02-22 18:50:42 +05:30
kstreee
53e0b56b13 [saltstack/salt#31194] Add documentation about running multiple salt-api modules, advised by @whiteinge. 2016-02-22 11:35:16 +09:00
rallytime
38f89bf8fd Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/beacons/inotify.py
  - salt/beacons/load.py
 2016-02-21 15:23:24 -07:00
rallytime
4baea26c58 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/topics/netapi/index.rst
  - salt/modules/win_servermanager.py
  - salt/modules/zypper.py
 2016-02-20 12:27:41 -07:00
twangboy
8dff065cec Fix some formatting issues 2016-02-19 16:56:35 -07:00
Nicole Thomas
8d0498eff4 Merge pull request #31368 from whiteinge/netapi-client-list 
Update list of netapi clients for autoclass
 2016-02-19 13:57:28 -07:00
Seth House
0cfe5d89a0 Update list of netapi clients for autoclass 2016-02-19 13:07:09 -07:00
Anand Nevase
b47799b17b Merge branch 'develop' of https://github.com/saltstack/salt into develop 2016-02-20 01:16:49 +05:30
Anand Nevase
a697c1845c Added windows vm changes as per review comments. 2016-02-20 01:12:47 +05:30
Joseph Hall
eea192a545 Add docs on how to actually use SDB 2016-02-19 11:55:39 -07:00
Nicole Thomas
d639d65381 Merge pull request #31332 from terminalmage/issue31167 
Clarify documentation for gitfs/hgfs/svnfs mountpoint and root options
 2016-02-19 11:31:29 -07:00
Jacob Hammons
017e7c18c4 changed build type back to develop after merge forward 2016-02-19 09:51:11 -07:00
twangboy
dfef24f13b Merge branch '2015.8' of https://github.com/saltstack/salt into 2015.8 2016-02-18 17:45:35 -07:00
twangboy
807257b138 Clarification for Windows Package Manger 
Formatting issues
 2016-02-18 17:45:06 -07:00
Jacob Hammons
07120a8d48 changed latest release to 2015.8.7 2016-02-18 17:29:44 -07:00
Jacob Hammons
7cd824ced9 Change latest release to 2015.8.7 2016-02-18 17:24:27 -07:00
Jacob Hammons
d4fb33939e Release notes and versioning for 2015.8.7 2016-02-18 17:19:54 -07:00
Erik Johnson
eebc325040 Clarify documentation for gitfs/hgfs/svnfs mountpoint and root options 2016-02-18 16:34:14 -06:00
Mike Place
078cbd6f9c Merge pull request #31328 from edgan/develop 
Adding documentation for salt-ssh agent forwarding support
 2016-02-18 14:42:39 -07:00
Mike Place
b40c611d0d Merge pull request #31067 from jfindlay/deprecate_env 
Deprecate env
 2016-02-18 14:42:10 -07:00
Mike Place
02f79dc2b3 Merge pull request #31322 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-02-18 14:28:02 -07:00
Nathan Grennan
024439186a Adding documentation for salt-ssh agent forwarding support 2016-02-18 12:14:47 -08:00
rallytime
cc29092dcb Merge branch '2016.3' into 'develop' 2016-02-18 11:33:24 -07:00
rallytime
7ea9dacbdd Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/beacons/inotify.py
  - salt/beacons/load.py
  - salt/minion.py
  - salt/modules/win_update.py
  - salt/modules/yumpkg.py
  - salt/utils/pkg/rpm.py
 2016-02-18 11:10:44 -07:00
Thomas S Hatch
2ef3918366 Add provisional statement to Thorium 2016-02-18 10:47:10 -07:00
Thomas S Hatch
56634682b2 sp 2016-02-18 09:32:23 -07:00
Thomas S Hatch
3ab8d21927 Add Thorium docs 2016-02-18 09:17:27 -07:00
Mike Place
7d8c2de090 Merge pull request #31281 from rallytime/bp-31218-and-31246 
Back-port #31218 and #31246 to 2016.3
 2016-02-17 13:27:41 -07:00
Mike Place
6fe4a7dc8a Document new functionality for packaging external modules 
Refs #31218
 2016-02-17 12:15:43 -07:00
Justin Findlay
896bfb181f carbon release notes: add note about env->saltenv deprecation 2016-02-16 21:37:30 -07:00
Justin Findlay
a260487298 carbon release notes: minor edits 2016-02-16 21:10:18 -07:00
Jacob Hammons
4640e819c8 Release notes updated 
Updates to doc build template
 2016-02-16 19:54:49 -07:00
Justin Findlay
4487d972f6 doc/topics/execution/remote_execution.rst: remove env support 2016-02-16 19:26:57 -07:00
Justin Findlay
bfc9982667 doc/topics/development/conventions/style.rst: remove env support 2016-02-16 19:26:57 -07:00
Justin Findlay
4953f7b0df doc/ref/renderers/index.rst: remove env support 2016-02-16 19:26:57 -07:00
Justin Findlay
a21bad82e5 doc/ref/file_server/index.rst: remove env support 2016-02-16 19:26:57 -07:00
Mike Place
11bcac2635 Merge pull request #31246 from cachedout/document_31218 
Document new functionality for packaging external modules
 2016-02-16 19:23:57 -07:00
Mike Place
39799fb31b Merge pull request #31244 from rallytime/release-notes-name 
Rename Boron release notes to 2016.3.0
 2016-02-16 19:23:06 -07:00
Jacob Hammons
3c4f8215c3 Fixes #30461 
Credited Sebastian Kramer for finding CVE 2016-1866 in release notes
Added note about salt virt not working on KVM in a VM
 2016-02-16 15:53:35 -07:00
Jacob Hammons
52d7b854d7 Support for building docs for next major release 2016-02-16 15:25:28 -07:00
Mike Place
93f84fe942 Document new functionality for packaging external modules 
Refs #31218
 2016-02-16 11:23:33 -07:00
rallytime
a19f7799e0 Rename Boron release notes to 2016.3.0 2016-02-16 11:16:09 -07:00
rallytime
8e3fd82718 Document onfail requisite bugfix behavior change 
Refs #22370 and #31235
 2016-02-16 10:44:42 -07:00
Mike Place
405d0aef1c Merge pull request #31184 from cachedout/document_consul_change 
Document change in consul pillars
 2016-02-16 09:11:52 -07:00
Mike Place
4cc033f8b9 Document change in consul pillars 
Refs #31165
 2016-02-12 15:13:53 -07:00
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