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
54,885 Commits 24 Branches 182 Tags 341 MiB
9b4b6bce64
Commit Graph

2611 Commits

Author SHA1 Message Date
Thayne Harbaugh
d6fe499f55 Allow compound expressions to begin with "not" 2015-04-22 17:38:17 -06:00
Joseph Hall
2a4ef7ce3b Updates to Stormpath as per Randall Degges 2015-04-22 15:59:09 -06:00
Colton Myers
bd6ecdfd43 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    doc/topics/installation/windows.rst
    doc/topics/tutorials/gitfs.rst
    salt/pillar/pepa.py
    salt/states/artifactory.py
    salt/states/pip_state.py
    salt/transport/__init__.py
 2015-04-21 10:42:22 -06:00
Colton Myers
1f9934c634 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    doc/topics/installation/windows.rst
    doc/topics/tutorials/gitfs.rst
 2015-04-20 11:39:41 -06:00
Joseph Hall
3b17858052 Merge pull request #22837 from nmadhok/vmware-cloud-driver 
Making vmware cloud driver Python3 compatible and other additions
 2015-04-19 15:57:43 -06:00
Nitin Madhok
64e527c4dc Adding ability to modify/create SCSI adapters #22364 2015-04-18 17:09:11 -04:00
Justin Findlay
900c7a510f Merge pull request #22800 from terminalmage/issue21979 
Improve error logging for pygit2 SSH-based remotes
 2015-04-18 11:18:55 -06:00
Justin Findlay
e99f2fdb28 Merge pull request #22813 from twangboy/win_doc_fix 
Updated instructions for building salt
 2015-04-17 22:10:07 -06:00
Nicole Thomas
dcd9e16a5c Merge pull request #22784 from techhat/stormpath 
Adding and updating Stormpath modules
 2015-04-17 16:50:25 -06:00
twangboy
adc421acdd Fixed some formatting issues 2015-04-17 15:03:47 -06:00
twangboy
8901b3b5a6 Updated instructions for building salt 2015-04-17 14:41:46 -06:00
rallytime
5931a582d1 Replace all 4s with 5s 2015-04-17 14:15:33 -06:00
rallytime
eadaead755 Add 2014.7.5 links to windows installation docs 2015-04-17 14:13:40 -06:00
rallytime
36b54ee79b Remove extra line 2015-04-17 12:53:58 -06:00
rallytime
93a858c591 Added release note for 2014.7.5 release 2015-04-17 12:53:50 -06:00
Erik Johnson
98885f71d6 Add information about libssh2 requirement for pygit2 ssh auth 2015-04-17 13:24:14 -05:00
rallytime
fde1feed46 Remove extra line 2015-04-17 11:42:14 -06:00
rallytime
b19b95d992 Added release note for 2014.7.5 release 2015-04-17 11:41:07 -06:00
Joseph Hall
7ee6103007 Adding and updating Stormpath modules 2015-04-17 08:37:23 -06:00
Colton Myers
2210bd175e Merge pull request #22668 from basepi/merge-forward-develop 
Merge forward from 2015.2 to develop
 2015-04-16 23:22:36 -06:00
Colton Myers
000de95974 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    .pylintrc
    doc/ref/runners/all/salt.runners.nacl.rst
    doc/topics/cloud/config.rst
    salt/cli/salt.py
    salt/client/mixins.py
    salt/client/ssh/__init__.py
    salt/loader.py
    salt/minion.py
    salt/modules/cassandra_cql.py
    salt/modules/gpg.py
    salt/modules/grains.py
    salt/modules/iptables.py
    salt/modules/yumpkg.py
    salt/netapi/rest_cherrypy/app.py
    salt/renderers/pyobjects.py
    salt/returners/mysql.py
    salt/runners/jobs.py
    salt/state.py
    salt/states/file.py
    salt/states/service.py
    salt/utils/minions.py
    tests/integration/__init__.py
    tests/integration/netapi/rest_tornado/test_app.py
    tests/integration/states/cmd.py
 2015-04-16 12:15:44 -06:00
Justin Findlay
e586c66917 revise contributing documentation 2015-04-16 10:28:00 -06:00
Colton Myers
ff8561df8d Add minor CVEs to 2014.7.4 release notes 2015-04-15 19:01:28 -06:00
Oliver Bestwalter
20ce197674 Add mention of Windows release candidates 
... so the windows folks realize, that they can test RCs easily as well :)
 2015-04-15 21:32:48 +02:00
Thomas S Hatch
b8e0638753 Merge pull request #22616 from alxbse/winrm-support 
add initial support for WinRM in Windows cloud deployment
 2015-04-15 09:55:30 -06:00
Wolodja Wentland
c52e9a94af Remove enabled option from pkgrepo.managed 
The 'enabled' option was highly ambiguous in that pkgrepo.managed also supports
a 'disabled' one that should be enough to express if a repository should be
enabled or disabled. It is also assumed that users who use pkgrepo.managed also
intend to use the repository later on which is why we set 'disabled' to False by
default.

This closes #22147
 2015-04-14 18:05:03 +01:00
Colton Myers
9099884809 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    doc/topics/cloud/config.rst
    salt/modules/win_disk.py
    salt/modules/yumpkg.py
    salt/pillar/s3.py
    salt/states/service.py
    salt/utils/event.py
    tests/integration/netapi/rest_tornado/test_app.py
    tests/integration/netapi/test_client.py
    tests/unit/states/archive_test.py
 2015-04-14 11:03:03 -06:00
Corin Kochenower
60b48ce1c0 Simple textual change 2015-04-14 08:54:34 -06:00
rallytime
becc997de4 Apply release note fix to develop branch 2015-04-13 15:34:24 -06:00
rallytime
fb03af37d3 Add note about missing state internal keyword arguments to release notes 2015-04-13 15:29:55 -06:00
Alexander Backlund
b7db2080d8 add initial support for WinRM in Windows cloud deployment 
fixes saltstack/salt#15984
 2015-04-13 16:03:37 -04:00
rallytime
1f243d6276 Apply release note change to develop 2015-04-13 13:53:03 -06:00
rallytime
9eb273f097 Add batch matching bug note to known issues in 2014.7.4 release notes 2015-04-13 13:35:48 -06:00
Mike Place
6a11ead5b4 Merge pull request #22453 from jacksontj/transport 
Abstracted Transport
 2015-04-13 09:38:52 -06:00
Joseph Hall
bbdf316063 Merge pull request #22483 from nmadhok/vmware-cloud-driver 
Adding more features to vmware cloud driver
 2015-04-11 18:31:03 -06:00
Nitin Madhok
4ab84a6bca Adding some documentation 2015-04-10 17:39:30 -04:00
rallytime
ccfa9f8158 Fix some broken links on the contributing docs 
Fixes #22537
 2015-04-10 14:06:36 -06:00
Thomas S Hatch
fbf35f94ab Merge pull request #22491 from plastikos/improvement-nested_nodegroups 
improvement: Support nested nodegroups
 2015-04-10 09:17:27 -06:00
shanedlee
c874ca8c20 Added additional details regarding windows implementation 2015-04-09 11:32:13 -04:00
Thayne Harbaugh
6179839225 Improve documentation for nested nodegroup. 2015-04-09 01:43:18 -06:00
David Beitey
22ad5d0063 Update git URL & formatting for Windows install 
Secure cloning is the standard practice for GitHub (vs ``git://``); other minor formatting improvements.
 2015-04-09 10:42:28 +10:00
Joseph Hall
aa23eb0e26 Merge pull request #22448 from rallytime/migrate_old_cloud_config_docs 
Migrate old cloud config documentation to own page
 2015-04-08 12:32:35 -06:00
Colton Myers
5f1a4b45b8 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-04-08 10:38:34 -06:00
Thomas Jackson
92ff4ff37f typo fixing! 2015-04-08 09:15:50 -07:00
Thomas Jackson
3b7170dc71 Add initial transport docs 2015-04-08 09:08:13 -07:00
rallytime
cecca10668 Kill legacy cloud configuration syntax docs per techhat 2015-04-07 20:09:37 -06:00
rallytime
52a3d500e8 Beef up cloud configuration syntax and add pillar config back in 2015-04-07 18:56:40 -06:00
rallytime
9b5318fe71 Move old cloud syntax to "Legacy" cloud config doc 2015-04-07 18:41:21 -06:00
rallytime
7a9ce92dd9 Add docs explaing file_map upload functionality 
Fixes #16886
 2015-04-07 17:23:02 -06:00
Colton Myers
25f9b2d2d1 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    doc/topics/cloud/action.rst
    doc/topics/cloud/function.rst
    doc/topics/reactor/index.rst
 2015-04-07 10:05:35 -06:00
Nitin Madhok
99bc6c9a49 Add some more examples for extra_config to documentation 2015-04-06 18:04:53 -04:00
Nitin Madhok
a659a39f18 Add some more examples for extra_config to documentation 2015-04-06 18:00:02 -04:00
Nitin Madhok
3746d37293 Adding ability to vmware cloud create() so extra_config can be specified. 2015-04-06 17:52:47 -04:00
Kevin Bowling
f324d38f8c 2015.2 relnotes edits 2015-04-06 14:36:51 -07:00
Nitin Madhok
e106574d24 Doc changes and enhancements 2015-04-05 16:46:48 -04:00
Nitin Madhok
c68a7cb2db Grammar correction in sentence 2015-04-04 17:49:44 -04:00
Nitin Madhok
4b7ac72352 Adding versionadded to docs and author 2015-04-04 17:25:27 -04:00
Nitin Madhok
28fa708cbb Adding docs to be able to specify network adapter settings 2015-04-04 17:04:07 -04:00
C. R. Oldham
06d761671a Add authentication against Active Directory 2015-04-03 17:26:59 -06:00
C. R. Oldham
ade043070d Add authentication against Active Directory 2015-04-03 17:26:59 -06:00
rallytime
eac4c63990 Add list_node docs to Cloud Function page 2015-04-03 16:30:58 -06:00
rallytime
bf31daa82e Add Feature Matrix link to cloud action and function pages 2015-04-03 16:15:50 -06:00
rallytime
d5fa02d566 Add list_node* functions to feature matrix 2015-04-03 15:59:16 -06:00
Nitin Madhok
4203c1e349 Adding functionality to create to be able to add/reconfigure hard disks 2015-04-03 16:03:52 -04:00
Thomas S Hatch
4281cd67fa Merge pull request #22300 from rallytime/windows_release_docs 
Add windows package installers to docs
 2015-04-02 17:45:38 -06:00
Seth House
a8bdc17bbf Better explanations and more examples of how the Reactor calls functions 
Refs #20841
 2015-04-02 17:07:22 -06:00
rallytime
5cd2db23eb Update sidebar and releasecandidate docs for rc2 2015-04-02 16:42:01 -06:00
jfindlay
d9369b1be7 Merge pull request #22262 from basepi/merge-forward-develop 
Merge forward from 2015.2 to develop
 2015-04-02 08:36:06 -06:00
Nitin Madhok
5a5f394eba Forgot to remove trailing spaces 2015-04-02 06:56:49 -04:00
Nitin Madhok
2a7c23ec83 Fixing lint and formatting docs 2015-04-02 06:28:32 -04:00
Colton Myers
0b7ac988cc Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    .pylintrc
    salt/beacons/service.py
    salt/beacons/sh.py
    salt/modules/cassandra_cql.py
    salt/returners/cassandra_cql_return.py
 2015-04-01 14:22:33 -06:00
Nitin Madhok
1e2a8c1a36 Adding more options that can be specified in create and docs for them 2015-04-01 14:42:58 -04:00
Nitin Madhok
4d6ac06947 Adding ability to specify and override the default vCPUS and memory 2015-04-01 05:54:52 -04:00
Thomas S Hatch
d2e4ac840d Merge pull request #22212 from ckochenower/2015.2 
Add detail for writing a returner
 2015-03-31 15:15:52 -06:00
Corin Kochenower
f44e25715a Add detail for writing a returner 2015-03-31 13:59:11 -06:00
Nitin Madhok
50f96bc389 Doc fixes 2015-03-31 14:25:53 -04:00
Nitin Madhok
bfa4ef77e2 Merge branch 'develop' of https://github.com/saltstack/salt into vmware-cloud-driver 2015-03-31 12:56:19 -04:00
Nitin Madhok
931ece7d20 Fixing some spninx errors and violations 2015-03-31 12:54:32 -04:00
Nitin Madhok
3fa499fd1d Adding Getting Started with VMware docs 2015-03-31 12:06:20 -04:00
Nitin Madhok
3d501b7a66 Docs fixes and adding VMware to core config docs 2015-03-31 11:23:36 -04:00
Nicole Thomas
44c7eb4d4b Merge pull request #22169 from basepi/merge-forward-develop 
Merge forward from 2015.2 to develop
 2015-03-31 09:21:36 -06:00
Justin Findlay
f50949e209 revise unit test documentation 2015-03-31 00:40:05 -06:00
rallytime
1abaacd868 Add windows package installers to docs 2015-03-30 16:10:10 -06:00
Colton Myers
124ad51c40 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    doc/ref/index.rst
    doc/topics/eauth/index.rst
    salt/beacons/__init__.py
    salt/beacons/service.py
    salt/loader.py
    salt/minion.py
    salt/output/nested.py
 2015-03-30 15:10:17 -06:00
Mike Place
4538ea629f Merge pull request #22057 from jfindlay/opts_prefix 
remove default prefix of '-' in archive.tar and archive.cmd_unzip
 2015-03-30 10:45:11 -06:00
Mike Place
adb8d5c718 Merge pull request #22054 from jfindlay/log_color 
convert custom LogRecord attribute formatting from {}- to %-style
 2015-03-30 10:37:18 -06:00
Peter Tripp
960df2b043 Add documentation for multiple Ubuntu PPAs. Fixes #18822 2015-03-29 00:31:07 -07:00
Mike Place
ef942ce3c8 Document becaon intervals 2015-03-27 16:38:36 -06:00
Justin Findlay
0e57aeb3d0 mention console log colors in beryllium release notes 2015-03-26 23:21:30 -06:00
Justin Findlay
4b2ebfaf7c document '-' prefix removal in Berrylium notes 2015-03-26 22:23:11 -06:00
Thomas S Hatch
45827bc933 Merge pull request #22060 from techhat/blobstorage 
Add azurefs external file server and supporting code and docs
 2015-03-26 17:12:19 -06:00
Joseph Hall
6ac0bcd2e4 Update docs for Azure blob management 2015-03-26 15:12:33 -06:00
Nicole Thomas
f38b67b687 Merge pull request #22041 from basepi/merge-forward-2015.2 
[2015.2] Merge forward from 2014.7 to 2015.2
 2015-03-26 10:30:21 -06:00
Colton Myers
afeb4743a1 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-03-26 09:45:55 -06:00
Rudy Attias
f733bfc7b0 added an example usage of smb_port 2015-03-26 17:31:38 +02:00
Mike Place
6fb70ea874 Add etcd sdb to 2015.2 release notes 2015-03-26 09:13:28 -06:00
Colton Myers
74dcd7df1c Add 2014.7.4 release notes 2015-03-26 09:03:35 -06:00
jfindlay
30013cd79e Merge pull request #22027 from jfindlay/notes 
edited 2015.2.0 release notes
 2015-03-26 07:49:23 -06:00
Justin Findlay
7ac7b74621 add release note about reactor users for runners 2015-03-25 21:14:10 -06:00
Justin Findlay
9b1e3f7a2a wrap at 80 chars 2015-03-25 21:12:51 -06:00
Justin Findlay
88add58cef misc cachedout edits 2015-03-25 21:10:48 -06:00
Mike Place
b0bd0b7aeb Merge pull request #22005 from cro/eauth_activedirectory 
Add ability to eAuth against Active Directory
 2015-03-25 15:41:56 -06:00
Thomas S Hatch
c58fe8bc07 Update release notes back to Jan 29th 2015-03-25 13:23:38 -06:00
C. R. Oldham
2eb6d26995 Add authentication against Active Directory 2015-03-25 13:01:37 -06:00
C. R. Oldham
7421042dd2 Add authentication against Active Directory 2015-03-25 12:49:35 -06:00
Colton Myers
b0fe5cc955 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    salt/fileclient.py
    salt/minion.py
    tests/unit/pyobjects_test.py
 2015-03-25 12:04:30 -06:00
Colton Myers
7ba2404cc9 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    conf/master
    conf/minion
    doc/ref/configuration/master.rst
    salt/loader.py
    salt/minion.py
    salt/modules/ssh.py
    salt/output/nested.py
    salt/utils/network.py
 2015-03-25 09:28:04 -06:00
Mike Place
2639f4b566 Release note changes 2015-03-24 17:02:18 -06:00
Mike Place
53846aa284 Merge pull request #21958 from cachedout/2015_2_mm_note 
Add known multimaster issue to 2015.2 notes
 2015-03-24 15:50:16 -06:00
Mike Place
98642d7b87 Add known multimaster issue to 2015.2 notes 2015-03-24 15:49:58 -06:00
Mike Place
e6d70629df 2014.7.3 release notes 2015-03-24 15:48:05 -06:00
Justin Findlay
1436d4011a add versions_report update to release notes 2015-03-23 14:02:16 -06:00
Thomas Jackson
2512a0841d Add LazyLoader and Singleton auth to 2015.2 release notes 2015-03-23 11:42:48 -07:00
Colton Myers
70406867a4 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    salt/client/__init__.py
    salt/modules/file.py
    salt/modules/yumpkg.py
    salt/modules/zypper.py
    tests/integration/shell/auth.py
    tests/unit/states/archive_test.py
    tests/unit/states/module_test.py
 2015-03-20 20:09:19 -06:00
Nicole Thomas
cdf10e5999 Merge pull request #21842 from ticosax/docu-gitfs 
Add a note regarding pkg-config to install libgit2
 2015-03-20 11:37:12 -06:00
Nicolas Delaby
b01dfa9150 Add a note regarding pkg-config to install libgit2 2015-03-20 16:25:35 +01:00
Colton Myers
2b1f400ab4 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    doc/topics/topology/syndic.rst
    salt/client/__init__.py
    salt/daemons/masterapi.py
    salt/minion.py
    salt/modules/dockerio.py
 2015-03-19 16:03:29 -06:00
Carl Meyers
cdd940761f Update index.rst salt-ssh doc 
Fixed typos and changed some wording.
 2015-03-18 22:35:04 -07:00
rallytime
f56cdd5489 Update syndic documentation 
Add some docs about installing a minion on the syndic to help reduce the amount of time spent waiting for the CLI to return.
 2015-03-18 16:05:07 -06:00
Preston Marshall
05d06a5d09 Add note about ldap module requirement 
Currently the only way you can figure out that you need the LDAP module is to read the source. I assumed it was installed as part of my OS package, but it is not. This documents it clearly that you need to install the module.
 2015-03-18 14:32:15 -05:00
Joseph Hall
5686e64149 Adding docs for new Azure functionality 2015-03-17 21:58:19 -06:00
Colton Myers
fd93491a5f Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	salt/cloud/clouds/linodepy.py
	salt/master.py
	salt/modules/boto_route53.py
	salt/modules/virt.py
	salt/renderers/gpg.py
	salt/runners/doc.py
	salt/runners/jobs.py
	salt/runners/manage.py
	salt/runners/virt.py
	salt/utils/event.py
	salt/utils/http.py
 2015-03-16 15:12:02 -06:00
Colton Myers
a983f1b611 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	salt/modules/win_ntp.py
	salt/templates/rh_ip/rh5_eth.jinja
	salt/templates/rh_ip/rh6_eth.jinja
	setup.py
 2015-03-13 17:02:19 -06:00
rallytime
01c8f94b31 Add minimum version dependency for linode-python in docs 
And warn users of older versions leaking sensitive information
into the debug logs.
 2015-03-13 11:53:02 -06:00
Thomas S Hatch
cc9d294fcd Merge pull request #21569 from basepi/merge-forward-2015.2 
Merge forward from 2014.7 to 2015.2
 2015-03-12 13:36:39 -06:00
Mike Place
5c59b4bd21 Note change in yosemite max values and warn. 
Closes #21589
 2015-03-12 10:02:53 -06:00
Colton Myers
ebe7eeafd9 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	doc/conf.py
	doc/man/salt-api.1
	doc/man/salt-call.1
	doc/man/salt-cloud.1
	doc/man/salt-cp.1
	doc/man/salt-key.1
	doc/man/salt-master.1
	doc/man/salt-minion.1
	doc/man/salt-run.1
	doc/man/salt-ssh.1
	doc/man/salt-syndic.1
	doc/man/salt-unity.1
	doc/man/salt.1
	doc/man/salt.7
	salt/cloud/clouds/linode.py
	salt/states/composer.py
	salt/states/win_update.py
 2015-03-11 15:14:56 -06:00
Mike Place
87bd28b8cb Note the issue number 2015-03-11 12:19:51 -06:00
Mike Place
9d5da3b878 Note the change in release notes 2015-03-11 12:19:51 -06:00
Thomas S Hatch
0eb66a36cb Merge pull request #21162 from cro/linode-python-driver2 
Update linode salt-cloud driver to support using either linode-python or apache-libcloud
 2015-03-11 11:45:15 -06:00
Seth House
c673e24a66 Merge pull request #21529 from whiteinge/doc-current-release-shortcut 
Replace current release Jinja variable with rST substitution
 2015-03-10 22:11:07 -04:00
Seth House
43709e0e10 Replace current release Jinja variable with rST substitution 
Follow-up to the changes in #21286.
 2015-03-10 22:06:59 -04:00
Thomas S Hatch
cc52707af9 Merge pull request #21516 from jfindlay/revise_contrib_doc 
fix contributing doc errors
 2015-03-10 17:59:39 -06:00
Erik Johnson
d25677e954 Merge branch '2015.2' into 2015.2-develop 2015-03-10 17:47:30 -05:00
Justin Findlay
0f631abe58 fix contributing doc errors 2015-03-10 16:04:17 -06:00
twellspring
6461b37e0f Clarify Mine Functions Aliases documentation 
Clarify how to specify positional parameters.
 2015-03-10 11:12:17 -07:00
Mike Place
393cf9c13a Note the change to tcp keepalives in release notes 2015-03-10 10:45:16 -06:00
Mike Place
56bac362fd Change bootstrap instructions to two liner 2015-03-09 18:24:53 -06:00
jfindlay
8ff95ac138 Merge pull request #21443 from basepi/merge-forward-develop 
Merge forward from 2015.2 to develop
 2015-03-09 16:55:25 -06:00
Thomas S Hatch
dc691ae3f4 Add return data example 2015-03-09 14:33:12 -06:00
Thomas S Hatch
bf201865d0 MOAR beacons docs 2015-03-09 14:10:06 -06:00
Colton Myers
d17c908b42 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	doc/topics/pillar/index.rst
	salt/beacons/diskusage.py
	salt/beacons/network_info.py
	salt/minion.py
	salt/modules/iptables.py
	salt/modules/nacl.py
	salt/modules/win_firewall.py
 2015-03-09 12:52:14 -06:00
Thomas S Hatch
ecacdcbe75 Merge branch 'develop' of https://github.com/VynceMontgomery/salt into VynceMontgomery-develop 2015-03-09 11:07:14 -06:00
Elias Probst
583239b893
Suggest a separate repo for top.sls. 
This replaces the suggestion to keep `top.sls` out of other branches
which is rather unpractical, as it would require to manually delete
it from each new created branch and prevent deleting it when merging
the branch back into `master`.
 2015-03-08 09:50:20 +01:00
Erik Johnson
0aa1029f24 correction to grains example 2015-03-07 11:40:43 -07:00
Vynce Montgomery
2723cb57a3 finish changing variable name 
a partial edit, renaming a variable for clarity, missed some cases.
 2015-03-06 23:33:05 -08:00
James Lamb
f18dc55ccb Merge branch 'develop' of https://github.com/jimmystewpot/salt into develop 2015-03-06 15:12:55 +11:00
James Lamb
ae1728ec4f Update documentation to include how to set a static IP within the VPC for aws/ec2 2015-03-06 15:10:02 +11:00
rallytime
414990fc03 2015.2 --> 2015.2.0 2015-03-05 15:02:01 -07:00
rallytime
e9402e7564 Remove "Lithium" and change to "2015.2.0" for versionadded tags 2015-03-05 12:44:22 -07:00
Nitin Madhok
b9cdd2b089 Replacing provider aws with ec2 fixes #21274 2015-03-04 20:49:00 -05:00
s8weber
ad869c74b1 add pillar_safe_render_error config 
allow a salt admin to config if the detailed render error of pillars
can be passed to the minion.
 2015-03-04 10:22:29 -05:00
Boris Feld
e97a34cae2 Update salt_token name 
salt_token seems to be now saved as ~/salt_token by default (a52ebdac3b/salt/config.py (L2192)), update the documentation about default salt-token save path
 2015-03-04 11:52:51 +01:00
Alexander Schwartz
0887dfe5d8 make latest 2014.7.x releases visible in documentation 2015-03-03 17:14:06 -07:00
Seth House
1399949196 Merge remote-tracking branch 'upstream/2015.2' into develop 2015-03-02 14:19:37 -07:00
C. R. Oldham
f171df4311 Merge forward 2015.2->develop 2015-03-01 19:54:22 -07:00
C. R. Oldham
00942f2060 Merge forward 2014.7->2015.2 2015-03-01 17:55:25 -07:00
Seth House
4d974d9676 Improved presence docs; added cross-references and localhost caveat 
Closes #18436.
 2015-02-28 19:22:38 -07:00
Fred Reimer
93a8673349 Merge remote-tracking branch 'upstream/2015.2' into issue_21167 2015-02-28 17:08:56 -05:00
Fred Reimer
883e4d1d1a
Added win_deploy_auth_retries and win_deploy_auth_retry_delay for ec2 cloud 2015-02-28 17:08:44 -05:00
C. R. Oldham
d19937eca2 Add docs for linode cloud driver 2015-02-28 12:23:22 -07:00
Erik Johnson
94d55889d7 Resolve merge conflicts 2015-02-28 12:35:25 -06:00
Erik Johnson
c734a7db18 Update LXC tutorial to reflect function name change 2015-02-27 23:10:22 -06:00
Erik Johnson
341b6622c8 gitfs: Add warning about ssh:// URLs (dulwich) 2015-02-27 14:53:57 -07:00
Erik Johnson
4ce8a9d064 Improve salt fileserver documentation 2015-02-27 14:53:57 -07:00
Erik Johnson
ccf99c7405 Add example of clearing gitfs cache pre-2015.2.0 2015-02-27 14:53:55 -07:00
Erik Johnson
815a1befa9 Add note about dulwich gitfs cache incompatibility 2015-02-27 14:53:55 -07:00
Thomas S Hatch
adef36a0ae Merge pull request #21122 from jfindlay/add_script_args 
add args to cmd.script_retcode
 2015-02-27 14:00:41 -07:00
Justin Findlay
367f14a4d0 add args to cmd.script_retcode 2015-02-27 10:52:15 -07:00
Erik Johnson
ff66ad3d11 Correct location of network configuration for Debian/Ubuntu 2015-02-27 18:16:13 +01:00
Erik Johnson
48fed17876 Add warnings about static IP configuration 2015-02-27 18:12:18 +01:00
Pedro Algarvio
62f868a076 Merge branch '2015.2' into develop 2015-02-27 10:02:47 +00:00
Mike Place
7cb5500610 Document becaon intervals 2015-02-26 18:00:12 -07:00
Fred Reimer
f94a3cbe2b Fix quote 2015-02-25 22:57:05 -05:00
Fred Reimer
376e4a6e79 Added documentation information concerning the ability to use instance role credentials 2015-02-25 22:51:45 -05:00
Justin Findlay
79255566b9 revise saltstack/salt contrib documentation 2015-02-25 15:05:21 -07:00
Erik Johnson
a2452aa611 gitfs: Add warning about ssh:// URLs (dulwich) 2015-02-24 22:37:30 -06:00
Erik Johnson
db85cd43f7 Improve salt fileserver documentation 2015-02-24 22:37:30 -06:00
Erik Johnson
61cfed60a1 Add example of clearing gitfs cache pre-2015.2.0 2015-02-24 22:37:28 -06:00
Erik Johnson
5bb28b6969 Add note about dulwich gitfs cache incompatibility 2015-02-24 22:37:28 -06:00
Mike Place
d31913118f ID field for event returns in mysql 2015-02-24 12:20:25 -07:00
Colton Myers
c8eb2d4665 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	doc/topics/installation/windows.rst
	salt/cloud/clouds/joyent.py
	salt/daemons/flo/core.py
	salt/minion.py
 2015-02-23 14:25:51 -07:00
jfindlay
ceee052c6f Merge pull request #20927 from hobakill/develop 
adding the file paths for 2014.7.2
 2015-02-23 10:28:50 -07:00
Nick Hobart
fbedbf74fb adding the file paths for 2014.7.2 2015-02-23 09:21:39 -06:00
Christian Page
309f977d5e Add 'Getting Started With vSphere' documentation 2015-02-22 10:31:42 -07:00
Thomas S Hatch
f522bb015d Merge pull request #20846 from techhat/joyent72 
Overhaul Joyent driver, mostly for new API
 2015-02-20 18:08:15 -07:00
Colton Myers
c3b7be0655 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	doc/topics/installation/rhel.rst
	salt/output/__init__.py
	salt/utils/__init__.py
 2015-02-20 13:51:59 -07:00
Erik Johnson
396e234848 Update the RHEL installation guide 
This updates the RHEL install instructions to reflect the new COPR for
installation on RHEL/CentOS 5.

Additionally, it provides better instructions on how to enable EPEL:

- We don't care about EPEL5, so this link has been removed.
- We needed a link for EPEL7, so this has been added.
- The old RPM installation example used hard-coded URLs to an arbitrary
  EPEL mirror. This is not a good idea since A) the mirror could go
  away, and B) we are unfairly sending people to a single mirror when
  the Fedora Project has a perfectly good link on their wiki to send
  people to a "random" mirror. The install example now uses these links.
 2015-02-20 11:59:19 -06:00
Joseph Hall
0ff1d027ab Add Joyent keyname note to release notes 2015-02-19 14:55:13 -07:00
Joseph Hall
215a35c0ff Joyent now requires a keyname to be set 2015-02-19 14:52:08 -07:00
Colton Myers
06a5085402 Merge pull request #20803 from basepi/merge-forward-develop 
Merge forward from 2015.2 to develop
 2015-02-18 17:16:37 -07:00
rallytime
9322d3b307 Update Arch installation docs to reference salt-zmq and salt-raet pkgs 2015-02-18 16:22:46 -07:00
rallytime
928bb30a6b Add 2014.7.2 package links to the windows installer docs 2015-02-18 13:55:26 -07:00
Colton Myers
f00465a8a1 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	doc/topics/event/index.rst
	salt/loader.py
	salt/modules/config.py
	salt/modules/cyg.py
	salt/modules/hg.py
	salt/modules/lxc.py
	salt/modules/upstart.py
	salt/states/hg.py
	salt/utils/cloud.py
	salt/utils/dictupdate.py
	salt/utils/schedule.py
	tests/integration/fileserver/gitfs_test.py
	tests/unit/pydsl_test.py
 2015-02-18 11:55:29 -07:00
Justin Findlay
dae5e2ddc6 Merge remote-tracking branch 'salt/2014.7' into 2015.2 
Conflicts:
	doc/topics/reactor/index.rst
	salt/modules/publish.py
	salt/modules/systemd.py
	salt/payload.py
 2015-02-18 11:33:10 -07:00
Mike Place
970c32ae8e Document the bug reporting procedure 2015-02-18 09:22:28 -07:00
Brandon Weaver
894d8d8c1a Fix typo 
Found a minor typo, quick fix.
 2015-02-17 13:09:51 -08:00
Wes Childs
020b8698ec Added required update 2015-02-17 14:32:21 +00:00
jfindlay
6cf085e218 Merge pull request #20728 from twellspring/patch-5 
Note eAuth PAM requires root salt-master
 2015-02-16 13:44:10 -07:00
jfindlay
c47beeac51 Merge pull request #20707 from russellballestrini/rb-state-archive-user-group 
state.archive recursively set group
 2015-02-16 13:36:34 -07:00
Russell Ballestrini
31dabae10d Deprecated archive_user in favor of standard user 
modified:   doc/topics/releases/2014.7.2.rst
	modified:   salt/states/archive.py
 2015-02-16 12:35:15 -05:00
twellspring
7ac3a18d08 Note eAuth PAM requires root salt-master 
Using eAuth with PAM external authentication module requires salt-master to be run as root
 2015-02-16 07:57:24 -08:00
Gabriel Fornaeus
91f58fd5ca Spelling error 2015-02-16 12:05:47 +01:00
Gabriel Fornaeus
5d3dd815b4 Compound match example added 2015-02-16 11:25:05 +01:00
Gabriel Fornaeus
66c2184eb4 Added to main documentation 2015-02-16 11:03:43 +01:00
Dennis Hall
478f42d9b2 Change Github to GitHub 2015-02-15 15:19:54 +01:00
rallytime
4805677d0c Add dependency notice to proxmox.rst 
Refs #14799
 2015-02-13 09:14:41 -07:00
Seth House
37017a54be Replace doc examples for event.fire_master with event.send 2015-02-12 17:28:21 -07:00
Seth House
f0b5ddb77d Updated Reactor docs to reference state.event instead of eventlisten 
Easier than downloading an external script.
 2015-02-12 17:24:22 -07:00
Nicole Thomas
f82183d13d Merge pull request #19235 from terminalmage/lxc-refactor 
LXC Refactor
 2015-02-12 17:16:52 -07:00
Arnold Bechtoldt
cca2563fdf set appropriate headline for release notes of 2015.2.0 2015-02-12 23:33:37 +01:00
Seth House
3e6e6f367b Merge remote-tracking branch 'upstream/2014.7' into 2015.2 2015-02-12 14:53:13 -07:00
jfindlay
b898539e49 Merge pull request #20641 from whiteinge/doc-events 
Updated the event docs with the current Python API and more examples
 2015-02-12 12:53:01 -07:00
Colton Myers
b2a80b195e Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-02-12 11:44:57 -07:00
Seth House
7de5f9db8d Updated the event docs with the current Python API and more examples 2015-02-12 11:36:12 -07:00
rallytime
3f9af9f7d3 Change the release notes title to 2014.7.2 2015-02-12 11:26:17 -07:00
rallytime
3c2dd7d801 Change the releasecnadidates doc to reflect 2015.2.0rc1 2015-02-11 12:30:16 -07:00
jfindlay
a572be2ca3 Merge pull request #20594 from basepi/merge-forward-develop 
Merge forward from 2015.2 to develop
 2015-02-11 11:40:15 -07:00
Colton Myers
1e5bd7e1b8 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	salt/client/mixins.py
	salt/fileserver/gitfs.py
	salt/loader.py
	salt/renderers/pyobjects.py
	salt/utils/args.py
	salt/utils/decorators/__init__.py
	salt/utils/lazy.py
	tests/integration/loader/globals.py
	tests/integration/loader/loader.py
 2015-02-11 09:17:35 -07:00
Dennis Hall
5cf8e389d4 Change Adjective in Starting States Tutorial 
The line which compares the previous two examples to the following YAML
example should use a demonstrative adjective like 'these'.
 2015-02-11 10:44:46 +01:00
Erik Johnson
89a58ac4c2 Update the LXC tutorial 
This updates the tutoral to reflect the new profile merging behavior.
 2015-02-10 15:06:47 -06:00
Erik Johnson
1530470339 No need to mention that Debian Jessie hasn't been released 2015-02-10 15:06:46 -06:00
Erik Johnson
10238f8be7 Add warnings about creating containers from rootfs image 2015-02-10 15:06:46 -06:00
Erik Johnson
1ea87ccaa9 Formatting tweak (for consistency) 2015-02-10 15:06:46 -06:00
Erik Johnson
a8fe526d20 Replace references to "next feature release" with 2015.2.0 2015-02-10 15:06:46 -06:00
Erik Johnson
832df20df2 Complete initial draft of LXC tutorial 
This will need to be filled out, but this is a good starting point.
 2015-02-10 15:06:45 -06:00
Erik Johnson
c4fc5f5fa4 More info for LXC tutorial 2015-02-10 15:06:45 -06:00
Erik Johnson
2dad71adc9 Add more info to LXC tutorial 2015-02-10 15:06:45 -06:00
Erik Johnson
728488e90b Tweak section header 2015-02-10 15:06:43 -06:00
Erik Johnson
196a7d6327 Stub for LXC tutorial 2015-02-10 15:06:43 -06:00
toppur
cdbaff63b7 Update formulas.rst 
There's not keyword named 'base' here, should be 'default'.
 2015-02-09 18:24:11 -08:00
Colton Myers
eba17606b4 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-02-09 15:37:25 -07:00
Erik Johnson
3e321fdb48 Add file-locking bugfix to 2014.7.2 release notes 2015-02-09 11:32:20 -06:00
Colton Myers
244c916b10 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	salt/modules/cron.py
	salt/states/npm.py
 2015-02-06 15:41:21 -07:00
Colton Myers
56520f4ac9 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	conf/minion
	salt/modules/cron.py
	salt/modules/pip.py
	salt/modules/tls.py
 2015-02-06 13:00:14 -07:00
Seth House
15936658ba Added cross-references to other ways to preseed minion keys 2015-02-05 19:15:46 -07:00
Justin Findlay
a44368001b fix pip venv regression, deprecate activate param 
Fixes #20191.  If `bin_env` points to a virtualenv, there is no need to
activate that virtualenv for pip to install into the virtualenv.  Also
update associated unit test.
 2015-02-05 12:36:42 -07:00
David Cournapeau
6847e054d8 DOC: add certifi to get proper https support. 2015-02-04 09:59:22 +00:00
Justin Findlay
b87615e277 document lowercase removal change 2015-02-03 16:27:41 -07:00
Thomas S Hatch
e742d995ea Merge pull request #20332 from westurner/patch-2 
DOC: topics/tutorials/walkthrough.rst: then > than
 2015-02-03 06:20:10 -07:00
Thomas S Hatch
c192b365f5 Merge pull request #20313 from basepi/merge-forward-develop 
Merge forward from 2015.2 to develop
 2015-02-03 05:55:49 -07:00
Wes Turner
203f5c3798 DOC: topics/tutorials/walkthrough.rst: then > than 2015-02-03 05:42:50 -06:00
Colton Myers
068a23e390 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	salt/daemons/flo/core.py
	salt/fileclient.py
	salt/utils/cloud.py
	salt/utils/schedule.py
 2015-02-02 15:27:43 -07:00
Diego Woitasen
e6f64019a8 How to store Minion config options on Pillars. 2015-02-02 09:27:13 -03:00
Colton Myers
ca6ecc0f0f Add only_upgrade to 2015.2 release notes 2015-01-30 16:07:39 -07:00
rallytime
9898fcf613 Merge branch '2015.2' into 'develop' 
Conflicts:
	.gitignore
	.pylintrc
	.testing.pylintrc
	salt/client/mixins.py
	salt/cloud/clouds/msazure.py
	salt/config.py
	salt/modules/mount.py
	salt/runners/doc.py
	salt/utils/event.py
	salt/utils/reactor.py
 2015-01-29 17:24:04 -07:00
Joseph Hall
f5e8b4a10e Don't default CA bundle updates to a non-standard location 2015-01-28 20:09:13 -07:00
Thomas S Hatch
97285aadd0 Merge pull request #20152 from techhat/httpupdate 
Add function to update CA cert bundle
 2015-01-28 15:03:55 -07:00
Joseph Hall
f846925ba7 Document text_out and headers_out 2015-01-28 11:08:31 -07:00
Joseph Hall
d1746fa7fe Document updating CA bundles 2015-01-28 10:51:04 -07:00