valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
72,822 Commits 24 Branches 182 Tags 341 MiB
45a12ccaf0
Commit Graph

294 Commits

Author SHA1 Message Date
Anthony Shaw
5b2a97e22b
added docs 2016-07-28 11:33:42 +10:00
Anthony Shaw
1280940079
linting fixes 2016-07-28 09:13:22 +10:00
Anthony Shaw
dac5cec503
start doc layout 2016-07-27 19:56:35 +10:00
rallytime
cc83fa151a Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/status.py
  - salt/utils/__init__.py
  - tests/unit/modules/boto_vpc_test.py
  - tests/unit/modules/mount_test.py
  - tests/unit/states/boto_vpc_test.py
 2016-06-28 17:34:27 -06:00
rallytime
f9ab8ba46d Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-06-28 14:26:24 -06:00
rallytime
f44a0543fe Fix test example in integration testing docs 
The example is out of date compared to the actual test it's modeling.

Notably, the self.state_result() function doesn't exist.
 2016-06-27 10:22:15 -06:00
rallytime
9d049e28e5 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/win_pkg.py
  - salt/states/disk.py
 2016-06-15 17:13:26 -06:00
Nicole Thomas
f546a00dc9 Merge pull request #34025 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-06-15 15:41:00 -04:00
Jacob Hammons
b20213fd79 Adds links to several current Salt-related projects 
Removes the salt_projects.rst file which hasn't been updated in a long time, this is replaced by the updated topics/projects/index.rst file
Adds a note about Salt Pack to the installation doc
 2016-06-13 17:11:36 -06:00
Ionuț Ciocîrlan
77ebe74fae fix formulas map.jinja example when using default values 
Fixed syntax error and replaced `default` kwarg with `base`.

The previous form would lead e.g. for RedHat to `Rendering SLS '...' failed: Jinja variable 'dict object' has no attribute 'server'`.
 2016-06-09 19:27:00 +03:00
Jεan Sacren
e39c3e29b4 Fix trivial grammar and spelling errors in the doc 2016-05-25 00:07:44 -06:00
rallytime
e6bbc82b58 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/grains/core.py
  - salt/modules/aptpkg.py
  - salt/pillar/stack.py
  - salt/returners/local_cache.py
  - salt/runners/manage.py
 2016-05-23 16:22:37 -06:00
rallytime
3aa1e6701c Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/win_pkg.py
 2016-05-23 15:10:06 -06:00
Nicole Thomas
637c2af0ad Add note to absolute_imports practice about __future__ import (#33377) 
Fixes #31430
 2016-05-20 10:32:25 -07:00
Mike Place
d5a3e309bf Event assert (#33262) 
* Initial POC

* Allow the queue to fill by waiting for the lag in IPC

* Add docs

* Add run_tests

* Add reactor to tests
 2016-05-19 13:41:23 -06:00
rallytime
c8b8d82745 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/proxy/junos.py
 2016-05-16 12:32:23 -06:00
rallytime
32779b8d71 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/x509.py
 2016-05-16 10:47:12 -06:00
Nicole Thomas
2a30c4879b Update Git Policy docs to match Contribution guide (#33252) 
Fixes #30946
 2016-05-15 13:08:37 -07:00
rallytime
a129d05b6d Update the release process docs 
Fixes #30605
 2016-05-13 14:28:57 -06:00
rallytime
cbf42a8407 Merge branch '2016.3' into 'develop' 
Conflicts:
  - conf/master
  - doc/ref/configuration/master.rst
  - salt/cli/batch.py
  - salt/cli/daemons.py
  - salt/config/__init__.py
  - salt/minion.py
  - salt/modules/aptpkg.py
  - salt/modules/beacons.py
  - salt/states/archive.py
  - salt/states/cmd.py
  - salt/utils/gitfs.py
  - tests/unit/states/cmd_test.py
 2016-04-26 14:42:26 -06:00
rallytime
80fcdfb9d8 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/topics/targeting/grains.rst
  - salt/cli/daemons.py
  - salt/exceptions.py
  - salt/minion.py
  - salt/modules/schedule.py
  - salt/scripts.py
  - salt/states/archive.py
 2016-04-26 12:07:42 -06:00
rallytime
9064d3bbfb Merge branch '2015.5' into '2015.8' 
Conflicts:
  - salt/cloud/clouds/vmware.py
  - salt/modules/file.py
  - salt/states/archive.py
 2016-04-25 15:45:17 -06:00
Colton Myers
3ec9502a86 Update "Low Hanging Fruit" to "Help Wanted" (#32675) 2016-04-19 07:03:46 -06:00
Andrew Pashkin
e9da85ba91 Fix YAML-block in "Organizing Pillar data" part of "Salt Formulas" docs page (#32527) 2016-04-13 08:06:19 -06:00
kaihowl
b465d54a76 Fix broken links in topics/development/contributing.rst 2016-04-09 19:09:17 +02:00
rallytime
eb6773823b Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/rh_service.py
 2016-04-01 10:33:44 -06:00
rallytime
fa5e17b342 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/win_service.py
  - salt/modules/zypper.py
  - salt/states/pkgrepo.py
 2016-03-30 15:33:13 -06: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
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
rallytime
a11d2e413a Add runners to __salt__ docs 2016-03-24 12:25:45 -06: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
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
rallytime
06dd2c0411 Fix linking syntax in testing docs 2016-03-16 16:43:53 -06: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
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
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
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
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
rallytime
6b526b5878 Add mentioned of Salt's Coding Style docs to the Contributing docs 2016-03-03 11:41:46 -07:00