valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
44,376 Commits 24 Branches 182 Tags 341 MiB
85dd96466b
Commit Graph

237 Commits

Author SHA1 Message Date
Colton Myers
7fc1cc2ba2 Merge branch '2014.7' into merge-forward 
Conflicts:
	doc/topics/releases/2014.7.1.rst
	salt/modules/mdadm.py
	salt/modules/mine.py
	salt/modules/win_firewall.py
	salt/modules/win_groupadd.py
	salt/modules/win_service.py
	salt/modules/win_system.py
	salt/modules/win_useradd.py
	salt/runners/jobs.py
	tests/unit/modules/mdadm_test.py
 2014-12-22 13:33:53 -07:00
rallytime
b43519b882 Update the windows package to correct one: 2014.7.0 --> 2014.7.0-1 
Fixes #19146
 2014-12-19 16:00:30 -07:00
Colton Myers
fc16bd16c0 Merge branch '2014.7' into merge-forward 
Conflicts:
	doc/faq.rst
	doc/ref/states/compiler_ordering.rst
	doc/topics/best_practices.rst
	doc/topics/development/conventions/formulas.rst
	salt/config.py
	salt/modules/state.py
	salt/states/mount.py
	salt/utils/event.py
	tests/unit/utils/process_test.py
 2014-12-16 14:45:25 -07:00
Seth House
51fa87c446 Change all state examples to use short-dec format for consistency 
Closes #12419.

The command used to search the docs for state examples is below. This
generates a file in Vim's quickfix format that can be loaded with the -q
flag.

find . -type f \( -name '*.rst' -o -name '*.py' \) -print0
    | xargs -0 -P10 -n1 awk '
        BEGIN { RS=""; FS="\n" }
        { linenr = linect; linect += (NF + 1) }
        /^\s+[a-zA-Z0-9'\''_-]+:\n\s+[a-zA-Z0-9'\''_-]+:\n\s+- / {
            print FILENAME "|" linenr + 2 "|", $1
        }
    ' > ./salt-states.quickfix
 2014-12-12 23:36:40 -07:00
Thomas Jackson
2bd05998b3 Comma cleanup 2014-12-12 11:40:10 -08:00
Thomas Jackson
498a612078 Whitespace cleanup 
Conflicts:
	doc/topics/cloud/linode.rst
	doc/topics/cloud/misc.rst
	doc/topics/cloud/parallels.rst
	doc/topics/cloud/proxmox.rst

Conflicts:
	doc/topics/development/architecture.rst
	doc/topics/development/translating.rst
 2014-12-11 07:53:19 -08:00
Thomas Jackson
0f4a23b93a Trailing whitespace cleanup 2014-12-11 07:53:19 -08:00
Thomas S Hatch
683987e4c3 Merge pull request #18715 from styro/new-windows-deps 
Add some new Windows build dependencies to docs.
 2014-12-04 16:46:02 -07:00
Colton Myers
472f6577e2 Merge branch '2014.7' into merge-forward 
Conflicts:
	salt/minion.py
	salt/modules/localemod.py
	salt/states/mount.py
	salt/transport/__init__.py
	salt/utils/schedule.py
 2014-12-04 11:11:11 -07:00
Anton D
12a43353e3 Add some new Windows build dependencies to docs. 2014-12-04 23:34:21 +13:00
Rick Holzer
e8df3f5332 Clarification 2014-12-02 16:21:55 -07:00
rallytime
9fe67a34c2 Make ZMQ 4 installation docs for ubuntu more clear 
References #18476
 2014-12-01 11:48:17 -07:00
Thomas S Hatch
cfd9352e8b Merge pull request #18076 from UtahDave/develop 
add additional repository command
 2014-11-14 14:24:56 -07:00
Erik Johnson
6902e829dd Add warning on RHEL ZMQ4 docs regarding python-hashlib 2014-11-14 11:51:42 -06:00
David Boucha
0e25bc4955 add additional repository command 
Is Canonical trying to make it harder and harder to find this?
 2014-11-13 17:13:50 -07:00
Colton Myers
257b3d4426 Merge branch '2014.7' into merge-forward 
Conflicts:
	salt/utils/__init__.py
	salt/utils/minions.py
 2014-11-10 14:08:49 -07:00
rallytime
4cbeebd3d0 Add 2014.7.0 release to windows installation doc 2014-11-07 15:26:28 -07:00
Thomas S Hatch
01b917fcf6 Merge branch '2014.7' into develop 
Conflicts:
	doc/topics/installation/windows.rst
	salt/states/rabbitmq_cluster.py
 2014-11-06 15:04:40 -07:00
Ignacio Torres Masdeu
5977ac4abf Explicitly explain homebrew's stance on sudo 2014-11-06 16:37:38 +01:00
Ignacio Torres Masdeu
6c8ad36c96 Homebrew explicitly discourages the use of sudo 
https://github.com/Homebrew/homebrew/blob/master/share/doc/homebrew/FAQ.md#sudo
 2014-11-06 16:10:32 +01:00
rallytime
6f10b96f01 Update windows installer links to include 2014.1.13 pkgs 2014-11-05 16:15:07 -07:00
nerdling
4d02c8da81 Update doc/topics/installation/osx.rst 
Unify instructions across package managers.
 2014-10-26 16:20:13 -04:00
rallytime
933be7c476 Merge branch '2014.7' into develop 
Conflicts:
	salt/master.py
	salt/returners/mysql.py
	salt/utils/cloud.py
	salt/utils/minions.py
 2014-10-25 08:54:42 -06:00
Erik Johnson
706f53941b Add notice on automatic installation of repoquery 2014-10-24 16:15:48 -05:00
Thomas S Hatch
9992edfdca Merge branch '2014.7' into develop 
Conflicts:
	salt/loader.py
 2014-10-20 15:52:31 -06:00
rallytime
559ed2906b Fix small typo in fedora installation docs 2014-10-20 12:06:46 -06:00
Thomas S Hatch
1468c26ec1 Merge branch '2014.7' into develop 
Conflicts:
	doc/faq.rst
	doc/ref/configuration/minion.rst
	salt/minion.py
	salt/states/pkg.py
	salt/transport/__init__.py
 2014-10-13 15:03:33 -06:00
Erik Johnson
8c80efd8eb Add info on upgrading to ZeroMQ 4 2014-10-08 16:56:28 -05:00
Erik Johnson
391a07e6ac Add info on upgrading to ZeroMQ 4 2014-10-08 16:51:33 -05:00
David Boucha
8464201a71 add links to Windows 2014.1.11 installers 2014-10-07 11:52:53 -06:00
Thomas S Hatch
69b6a1c313 Merge branch '2014.7' into develop 2014-10-06 11:02:27 -06:00
C. R. Oldham
670a39a580 Add warning for FC19 users. 2014-10-03 13:29:41 -06:00
Mike Place
1975043730 Merge pull request #16332 from rallytime/fedora_docs 
Add intalling from testing section to fedora installation docs
 2014-10-03 13:06:27 -06:00
C. R. Oldham
3fef918352 Add warning for FC19 users. 2014-10-03 12:52:46 -06:00
rallytime
b6075c7425 Add intalling from testing section to fedora installation docs 2014-10-02 13:44:22 -06:00
Chris Rebert
177c168a21 Fix numerous typos found via Lintian 
Thanks https://github.com/Debian/lintian/tree/master/data/spelling !
 2014-08-11 10:46:43 -07:00
David Boucha
7e7f07927d add links to 2014.1.10 installers 2014-08-05 16:02:09 -06:00
Erik Johnson
57096ca59c Convert double-colon to code-block 2014-07-14 12:37:13 -05:00
David Boucha
98b7c1cdfd add links to 2014.1.7 Salt Windows installers 2014-07-12 23:21:06 -06:00
Thomas S Hatch
c2c9ea05e3 Merge pull request #14119 from gravyboat/develop 
Fixed a few more files with code block issues.
 2014-07-10 17:14:04 -06:00
Thomas S Hatch
7489599848 Merge pull request #14112 from kennyballou/arch_install_doc_update 
Update Arch Linux Installation Documentation
 2014-07-10 17:11:41 -06:00
Forrest Alvarez
fd2ecf41bd Updated the debian and index doc files within the installation topic to fix code blocks. 2014-07-10 14:59:37 -07:00
kballou
a270f08292 Update Arch Installation Header 
Related to change f40c97c12c
 2014-07-10 15:46:52 -06:00
kballou
f40c97c12c Update Arch Linux Installation Documentation 
Arch Linux has official support for the `salt` package (including
dependencies), update installation instructions to reflect this change.

Related, restructure notes about installing development builds from AUR.
 2014-07-10 15:30:59 -06:00
Ronan Amicel
77dfa9eff4 Docs: fix list formatting on the Installation page 2014-06-19 11:56:28 +02:00
Pedro Algarvio
33b1532239 Remove ending install 2014-06-18 00:46:59 +01:00
Pedro Algarvio
acf51004f8 Update documentation accordingly 2014-06-18 00:36:35 +01:00
Pedro Algarvio
4ba108a0d7 Also provide a pip example on how to pass the global variable 2014-06-17 16:01:11 +01:00
Pedro Algarvio
a2c8175181 Document the --salt-transport option 2014-06-17 15:53:29 +01:00
Pedro Algarvio
85427e73d7 Update install documentation to reflect RAET deps 2014-06-17 15:36:02 +01:00