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
51,360 Commits 24 Branches 182 Tags 341 MiB
dcd9e16a5c
Commit Graph

4311 Commits

Author SHA1 Message Date
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
Nicole Thomas
e7c7608ae2 Merge pull request #22018 from whiteinge/doc-sdb-modules-index 
Add sdb modules to the module index
 2015-03-25 16:36:50 -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
Seth House
264c08841e Added generated .rst files for the various sdb modules 2015-03-25 17:11:20 -04:00
Seth House
c2af83ea3e Added sdb modules to the module index 2015-03-25 17:08:19 -04: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
Nicole Thomas
cda629d531 Merge pull request #21963 from cachedout/2014_7_3_changes 
Release note changes
 2015-03-24 17:32:24 -06:00
Mike Place
2639f4b566 Release note changes 2015-03-24 17:02:18 -06:00
Thomas S Hatch
afcf1d7b27 Merge pull request #21955 from rallytime/update_master_conf_doc 
Add default for pillar_source_merging_strategy in conf/master file
 2015-03-24 16:45:40 -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
rallytime
73a0df18a8 There are 4 values, not 3. 2015-03-24 14:57:29 -06:00
rallytime
c98118eb55 Update pillar_source_merging_strategy config doc spacing 
to match accross all config values
 2015-03-24 14:56:09 -06:00
John Syrinek
6558d9e6d7 Fix unless example 
The second `unless` example failed to compile
 2015-03-24 14:02:27 -05: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
Godefroid Chapelle
ffe267a741 Specify valid values for gitfs_provider option 2015-03-23 15:33:10 +01:00
Arnold Bechtoldt
db38f80945 update references, fixes #21879 2015-03-22 10:16:41 +01: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
jfindlay
078b849ee3 Merge pull request #21763 from whiteinge/doc-pdf-link 
Replaced PDF link to RTD to the GitHub releases page
 2015-03-18 00:41:30 -06:00
Seth House
2e426ddec7 Replaced PDF link to RTD to the GitHub releases page 
Temporary fix until we something more permanent in place.
 2015-03-17 22:43:00 -06: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
jfindlay
5b4972b55d Merge pull request #21574 from rallytime/full_version 
Use the full version for a versionadded tag
 2015-03-11 17:50:23 -06:00
rallytime
0171f68600 Use the full version for a versionadded tag 2015-03-11 16:29:08 -06:00
Colton Myers
fec632ae18 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	salt/utils/cloud.py
 2015-03-11 15:18:00 -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
Elias Probst
bc9a30b7e9 Typo (rendered → renderer) 2015-03-11 21:15:32 +01: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
049975a1ca Added versionadded for ext_pillar_first 2015-03-11 11:53:59 -04:00
Seth House
5f1feb838d Switch the current release version back to 2014.7.2 
Accidentally bumped in #21467.
 2015-03-10 22:44:54 -04: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
eef62c762d Merge pull request #21492 from cachedout/tcp_doc 
Note the change to TCP keepalives in release notes
 2015-03-10 10:12:13 -06:00
Mike Place
393cf9c13a Note the change to tcp keepalives in release notes 2015-03-10 10:45:16 -06:00
Jacob Hammons
921d679065 Regenerated and updated man pages, updated release version in conf.py to 2014.7.2 2015-03-10 09:22:57 -06:00
Seth House
6aa498947a Removed SaltConf banner 2015-03-10 09:05:06 -04:00
Jacob Hammons
767a3c378d Updated man pages, updated copyright year in conf.py 2015-03-09 18:36:38 -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
jfindlay
fba2284161 Merge pull request #21447 from thatch45/beacon_doc 
MOAR beacons docs
 2015-03-09 15:58:26 -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
rallytime
a71aa68415 Remove .rst from doc link 
Fixes #21442
 2015-03-09 12:58:07 -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
Thomas S Hatch
76a976baca Merge pull request #21412 from eliasp/develop-doc-topics-tutorial-gitfs_separate_repo_for_top.sls 
Suggest a separate repo for `top.sls`.
 2015-03-09 10:51:39 -06:00
Thomas S Hatch
d16aa59c6d Merge pull request #21379 from jacksontj/2015.2 
2015.2: Add raw bool support to decorators
 2015-03-09 10:46:08 -06:00
Joseph Hall
6238c6c8f4 Merge pull request #21410 from PeterS242/develop 
Update faq.rst
 2015-03-08 09:14:50 -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
Peter Smith
d836b2b3df Update faq.rst 
Fixed misspelling on "alternative" and updated cmd.run procedure to disconnect all input and output for the thread before executing the NOHUP.
 2015-03-08 00:54:50 -06: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
Thomas Jackson
b8e39c13f9 Add docs for new raw boolean support of depends decorator 2015-03-05 22:02:34 -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
jfindlay
a52ebdac3b Merge pull request #21286 from ahus1/ahus1_releasedocs 
make latest 2014.7.x releases visible in documentation
 2015-03-03 23:19:26 -07:00
Alexander Schwartz
0887dfe5d8 make latest 2014.7.x releases visible in documentation 2015-03-03 17:14:06 -07:00
Erik Johnson
ec2fe0d553 Add nspawn.remove function 
Also adds nspawn.destroy as an alias, for those who are used to managing
LXC containers.
 2015-03-03 14:38:53 -07:00
Erik Johnson
046a8fed7a Add compatibility function "remove" 
For people using a mix of LXC and nspawn containers
 2015-03-03 14:36:45 -07:00
Erik Johnson
ee570cf0a2 Add RST file for nspawn 2015-03-03 10:10:50 -07:00
Thomas S Hatch
3467622977 Merge pull request #21229 from thatch45/master_service 
Engines
 2015-03-03 09:35:48 -07:00
Seth House
714921a5dc Added autosummary placeholders for new models 2015-03-02 22:14:33 -07:00
Seth House
b6c1b2601f Added new modules to the module indexes 2015-03-02 22:13:42 -07:00
Seth House
1399949196 Merge remote-tracking branch 'upstream/2015.2' into develop 2015-03-02 14:19:37 -07:00
Seth House
57b1f67daa Added autosummary generated placeholders for the new module docs 2015-03-02 14:07:18 -07:00
Seth House
1382401618 Updated all the module index pages with the latest/newest modules 2015-03-02 13:59:19 -07:00
Seth House
b001cb6534 Added engine modules to modules index in docs 2015-03-02 13:49:17 -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
C. R. Oldham
c9610bc4f2 Merge commit, merge forward 2014.7 to 2015.2 2015-02-27 15:01:30 -07: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
a7ba699ad7 remove grains outputter from autosummary 2015-02-27 18:12:18 +01:00
Erik Johnson
48fed17876 Add warnings about static IP configuration 2015-02-27 18:12:18 +01:00
Erik Johnson
abf00abea4 remove the docs' .rst file for deleted grains outputter 
See e1f8ea6.
 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
Ryan Lane
1bc840a3a9 Add missing boto docs 2015-02-25 12:50:44 -08: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
jfindlay
a38c17efde Merge pull request #20901 from aspyatkin/feature-bower 
Add Bower execution and state modules
 2015-02-23 21:40:10 -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
Alexander Pyatkin
5edb6cba11 Implement Bower state module 2015-02-21 05:57:54 +00:00
Alexander Pyatkin
c408c935a0 Implement Bower execution module 2015-02-21 05:56:20 +00: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
6338b4f820 Update latest release in docs 2015-02-19 09:20:45 -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
dsumsky
6d797f50d4 - log_level_logfile and log_level configuration options inheritance docu updated 2015-02-12 19:47:59 +01: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
rallytime
a42a5fb6d5 Add release candidate notification to docs sidebar 
v2015.2.0rc1
 2015-02-11 12:17:29 -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
93835d3f4e Hide set_pass from lxc state docs 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
Arnold Bechtoldt
88dea95c6c add some cosmetic changes to the state requisites article 2015-02-07 18:46:03 +01:00
Seth House
60b960c33e Merge remote-tracking branch 'upstream/2015.2' into develop 2015-02-06 19:53:04 -07:00
Seth House
9a1a2db3aa Merge remote-tracking branch 'upstream/2014.7' into 2015.2 2015-02-06 19:52:23 -07:00
Seth House
bf6dfe823e Remove Mako from mocked deps for docs build 
If Mako was mocked for a reason originally, it doesn't seem to be needed
anymore. The docs build just fine with and without Mako installed.

Closes #9571 (at long last).
 2015-02-06 19:00:35 -07: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
Nicole Thomas
9937702767 Merge pull request #20338 from pakdel/mssql 
MS SQL Execution module
 2015-02-03 14:03:31 -07:00
Amir Pakdel
eabb8a262c Added MS SQL execution module 2015-02-03 10:02:09 -05: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