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
67,732 Commits 24 Branches 182 Tags 341 MiB
f267b7b6ac
Commit Graph

5757 Commits

Author SHA1 Message Date
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
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