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
44,766 Commits 24 Branches 182 Tags 341 MiB
fab600add9
Commit Graph

2114 Commits

Author SHA1 Message Date
Chris Rebert
19e262bb7b Fix typos with the help of https://github.com/vlajos/misspell_fixer 2015-01-16 13:35:47 -08:00
Todd Wells
99114eeeeb cloud timeout doc updates 2015-01-16 12:37:28 -08:00
Mike Place
0ac3e624af Remove a documentation surprise 2015-01-14 15:28:40 -07:00
Nicole Thomas
63e207ee30 Merge pull request #19662 from basepi/merge-forward-develop 
Merge forward from 2015.2 to develop
 2015-01-13 15:23:09 -07:00
Colton Myers
8363db9d29 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 2015-01-13 12:09:56 -07:00
Colton Myers
2a6c9a8165 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	doc/topics/ssh/index.rst
 2015-01-13 11:58:58 -07:00
Joseph Hall
11d802d873 Allow joyent api host suffix to be configurable 2015-01-13 07:32:02 -07:00
David\ Beitey
839968f637 Expand documentation about Saltfile for salt-ssh 2015-01-13 16:50:29 +10:00
Aurynn Shaw
b7ae48642a Adds fire_master to the Salt Event library, for use in 3rd-party code. 2015-01-13 09:29:27 +13:00
Thomas S Hatch
bc74de81c6 Merge branch 'develop' of https://github.com/aurynn/salt into aurynn-develop 
Conflicts:
	doc/topics/ssh/roster.rst
 2015-01-12 11:36:24 -07:00
Aurynn Shaw
e1dbd4c07e Removes spurious text 2015-01-12 13:55:44 +13:00
Aurynn Shaw
7e4f5639ec Updates Salt SSH roster documentation, adding thin_dir and a note on setting persistent grains 2015-01-12 13:54:30 +13:00
Thomas S Hatch
cad85fd81b Merge pull request #19583 from basepi/merge-forward-develop 
Merge forward from 2015.2 to develop
 2015-01-09 17:49:43 -07:00
Thomas S Hatch
02251ae8fa Merge pull request #19582 from manonthemat/develop 
url fix of dependency in installation guide
 2015-01-09 17:47:46 -07:00
Mike Place
1b78f4069f Use __func_alias__ 2015-01-09 15:03:44 -07:00
Colton Myers
35596415b2 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	salt/modules/brew.py
	salt/modules/disk.py
 2015-01-09 12:57:49 -07:00
manonthemat
e59f5b3b4d url fix 
http://docs.saltstack.com/en/latest/topics/installation/index.html linked to msgpack-python version 0.1.12. The fix links to the latest version (which is version 0.4.4 at the time of this commit), since not a specific version of msgpack-python was written down as a dependency.
 2015-01-09 11:27:32 -08:00
Colton Myers
3ce5eb2838 Merge branch '2014.7' into merge-forward-2015.2 
Conflicts:
	salt/modules/archive.py
	salt/modules/brew.py
	salt/modules/pip.py
	tests/unit/modules/archive_test.py
	tests/unit/modules/pip_test.py
 2015-01-09 11:39:09 -07:00
Mike Place
b5c0dbe0ed Cleanup jboss module 
Closes #18600
 2015-01-08 17:15:05 -07:00
Mike Place
b419366443 Release note note 
Fixes #18551
 2015-01-08 16:41:20 -07:00
Thomas S Hatch
0529136858 Merge pull request #19510 from JensRantil/sphinx-1.3b2 
doc(dev-bootstrap): Sphinx 1.3b2
 2015-01-08 09:57:42 -07:00
Jens Rantil
9e92864398 doc(dev-bootstrap): Sphinx 1.3b2 
I was getting an error that the current stable version of Sphinx wasn't
new enough. Installing Sphinx 1.3b2 did the trick.
 2015-01-08 08:04:11 +01:00
Thomas S Hatch
4713574a01 Merge pull request #19486 from s0undt3ch/merge/19161 
Merge #19161
 2015-01-07 16:06:24 -07:00
Thomas S Hatch
35af81b4b7 Merge pull request #19482 from JensRantil/warn-socketpath-early 
Development bootstrap documentation improvements
 2015-01-07 14:55:43 -07:00
Jens Rantil
30978b1070 doc(bootstrap-dev): mention short virtualenv path early 
This was the second time I ran into this issue. Annoying after going
through all the steps of installing applications in the virtual
environment etc.
 2015-01-07 22:25:31 +01:00
Jens Rantil
4666b29174 doc(bootstrap-dev): make long socket path warning a note 
It doesn't really feel like part of the text body.
 2015-01-07 22:25:24 +01:00
Pedro Algarvio
1ce6910467 Some fixes to #19161 2015-01-07 20:58:40 +00:00
Jens Rantil
fee650b4b0 one less command to get started when bootstrapping 2015-01-07 21:41:19 +01:00
Pedro Algarvio
a952d46830 Merge branch 'develop' of https://github.com/h4ck3rm1k3/salt into merge/19161 2015-01-07 18:09:15 +00:00
Colton Myers
c5cdc575d0 Merge branch '2015.2' into merge-forward-develop 
Conflicts:
	salt/utils/reactor.py
	tests/jenkins-ng.py
 2015-01-06 14:16:15 -07:00
twellspring
f8883cebdd Add private subnets 
Added how to enable rackspace private subnets on servers instantiated by salt cloud
 2015-01-02 19:28:45 -08:00
James Michael DuPont
e6e7ab6cbc rooted config 
* updated documentation
* troubleshooting
* Itegrated comments and feedback
* bugfixes to format and language
* linting the changes
 2015-01-01 07:07:09 -06:00
manonthemat
a1625ef7c6 added note about Arch Linux's default transport 2014-12-30 11:28:15 -08:00
twellspring
43aa4293b1 Install remaining core components: salt-cloud, ... 
Core components salt-cloud, salt-ssh, salt-api are packaged separately, but should be installed by most users.
 2014-12-29 10:13:13 -08:00
Justin Findlay
ad33589fac move requirements files into requirements dir 2014-12-27 17:29:03 -07:00
Matthias Sieber
d8af90c611 update States Tutorial part 2 
Explanation of yaml file with matching line numbers
 2014-12-23 16:20:42 -08:00
Colton Myers
cc74c400b9 Add docs for mine in salt-ssh 2014-12-23 12:14:31 -07:00
Colton Myers
139bd8df5b Add salt-ssh mine to lithium release notes 2014-12-23 11:35:40 -07:00
Colton Myers
321413e638 Rename lithium release notes to 2015.2.0 2014-12-23 11:34:52 -07:00
Colton Myers
dc778a8e5e Merge branch '2014.7' into develop 
Conflicts:
	salt/client/ssh/__init__.py
	salt/states/boto_secgroup.py
 2014-12-23 10:57:26 -07:00
Colton Myers
f2fd892dc5 Merge pull request #19145 from whiteinge/sphinx-fixups 
Minor Sphinx fixups
 2014-12-22 16:25:01 -07:00
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
Seth House
a8e8111c92 Add a cross-ref to the vmbuilder formula repo 2014-12-19 14:34:58 -07:00
Seth House
a33ae0655f Switch the :formula: extlink to :formula_url: 
The addition of the Salt domain conflicted with this role. Better to
rename this one to be more explicit and to save that real-estate for
future use.
 2014-12-19 14:34:57 -07:00
Colton Myers
9d5e05a381 Add more release notes for 2014.7.1 2014-12-18 14:19:52 -07:00
Thomas S Hatch
1dcc05b049 Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/yumpkg.py
 2014-12-17 15:00:26 -07:00
Thomas S Hatch
45365c095e Merge pull request #19029 from basepi/merge-forward 
Merge forward from 2014.7 to develop
 2014-12-17 14:48:01 -07:00
Joseph Hall
bc58c569ab Update docs for impacket dep 2014-12-17 11:45:49 -07:00
rallytime
926c486587 Correct master_sign_key_name reference 
Fixes #19053
 2014-12-17 11:32:23 -07:00