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)
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
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
rallytime
c65d9673a7
Merge branch '2014.7' into merge_forward_fifteen_second_try
...
Conflicts:
salt/states/file.py
2015-01-29 13:42:49 -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
Seth House
e3d29bf8ff
Fixed syntax error in log_granular_levels example
2015-01-27 20:14:53 -07:00
rallytime
dc23823897
Merge branch '2014.7' into '2015.2'
...
Conflicts:
salt/modules/localemod.py
2015-01-27 13:24:14 -07:00
rallytime
80bfa4a2a6
Add beacons section to 2015.2.0 release notes
2015-01-26 20:26:51 -07:00
Colton Myers
c4da7bdd64
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/client/mixins.py
salt/daemons/flo/__init__.py
2015-01-26 19:44:59 -07:00
Seth House
8e476bc455
Fixed typos in the beacon docs
2015-01-26 18:20:54 -07:00
Seth House
b777d3cba1
Added unique identifier for the beacon docs
2015-01-26 18:19:34 -07:00
Seth House
a26aef0d7d
Added beacon module docs to the module index
2015-01-26 18:19:34 -07:00
Seth House
127ddb6d9c
Added cross-references to the inotify beacon module
2015-01-26 18:19:34 -07:00
Thomas S Hatch
5affea1022
Merge branch '2015.2' into beacons
2015-01-26 16:57:43 -07:00
Shane D Lee
7c253f5ede
Changed exe's to installers
2015-01-26 15:48:03 -07:00
Thomas S Hatch
bfc6ead3b0
Merge pull request #20039 from bechtoldt/doc_various_fixes
...
completing some doc references
2015-01-26 12:15:38 -07:00
Thomas S Hatch
5cc9a7c249
Merge pull request #20037 from bechtoldt/fix_19262
...
add missing file_tree and virtkey in pillar index doc, refs #19262
2015-01-26 12:15:02 -07:00
Colton Myers
a17c3716bd
Merge remote-tracking branch 'upstream/2015.2' into develop
2015-01-26 10:16:37 -07:00
Thomas S Hatch
828906d62d
Merge branch '2015.2' into beacons
2015-01-25 09:26:43 -07:00
Arnold Bechtoldt
439f253998
adding runners to doc salt.runners reference
2015-01-24 22:46:06 +01:00
Arnold Bechtoldt
4e72fdedb2
adding returners to doc salt.returners reference
2015-01-24 22:44:03 +01:00
Arnold Bechtoldt
2ad37d0bca
adding renderers to doc salt.renderers reference
2015-01-24 22:41:54 +01:00
Arnold Bechtoldt
020ca989a3
adding output to doc salt.output reference
2015-01-24 22:38:28 +01:00
Arnold Bechtoldt
eeeff3b393
adding states to doc salt.states reference
2015-01-24 22:35:23 +01:00
Arnold Bechtoldt
7724073588
adding modules to doc salt.modules reference
2015-01-24 22:30:52 +01:00
Arnold Bechtoldt
73cbbf0e5f
those files seem to be required, too
2015-01-24 21:51:45 +01:00
Arnold Bechtoldt
0ab5f51529
add missing file_tree and virtkey in pillar index doc, refs #19262
2015-01-24 21:43:32 +01:00
Thomas S Hatch
54529a9aa2
Add initial documentation
2015-01-23 23:11:34 -07:00
Pedro Algarvio
cdbbe4c0dd
Fix typos
2015-01-24 03:16:52 +00:00
Mike Place
b8e9249c80
Added docs for Lithium deprecations
2015-01-24 03:16:49 +00:00
Colton Myers
9e9a2eab90
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
salt/fileserver/gitfs.py
salt/loader.py
2015-01-23 16:13:30 -07:00
Thomas S Hatch
55cb7fdab1
Merge pull request #20015 from basepi/grainsprecedencedocs19611
...
Fix grains precedence issues
2015-01-23 15:40:32 -07:00
Colton Myers
8bba4bbec4
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/cloud/clouds/msazure.py
salt/modules/boto_sns.py
salt/states/boto_sns.py
tests/integration/modules/boto_sns.py
tests/integration/states/boto_sns.py
2015-01-23 14:20:34 -07:00
Thomas S Hatch
2e48f6a4ec
Merge pull request #19967 from alxbse/win_repo_multiple_sources
...
multiple source files in windows repo to fix saltstack/salt#9028
2015-01-22 20:04:58 -07:00
jasonm-makerbot
64e816280a
Update index.rst
...
Correcting ordering of arguments, original way throws an error
2015-01-22 19:16:44 -05:00
Colton Myers
f609366dee
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/conf.py
2015-01-22 16:53:22 -07:00
Colton Myers
f1e7661973
Release 2014.7.1 (docs sidebar and release date for release notes)
2015-01-22 16:52:21 -07:00
Colton Myers
079e20a536
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
2015-01-22 16:48:27 -07:00
Colton Myers
63195007d6
Merge pull request #19980 from rallytime/update_windows_release_docs
...
Add 2014.7.1 release to Windows Installation Docs
2015-01-22 16:48:15 -07:00
Colton Myers
c1e630340e
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
salt/fileserver/gitfs.py
salt/grains/core.py
2015-01-22 16:46:32 -07:00
Alexander Backlund
e5c59deab3
added support for multiple source files in windows repo to fix saltstack/salt#9028
2015-01-22 11:55:33 -08:00
robert.fach
4f7b0a29d1
updated information regarding required version for dulwich gitfs backend
2015-01-22 17:14:27 +01:00
Colton Myers
a067e6ceba
Fix the grains precedence documentation
...
Fixes #19611
2015-01-21 16:10:18 -07:00
Colton Myers
9446633e9d
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
2015-01-21 12:05:51 -07:00
Colton Myers
098c39596a
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
salt/templates/rh_ip/rh5_eth.jinja
salt/templates/rh_ip/rh6_eth.jinja
salt/utils/templates.py
2015-01-21 11:19:06 -07:00
Thomas S Hatch
678c57f414
Merge pull request #19907 from techhat/httpdocs
...
Update HTTP tutorial for new functionality
2015-01-21 10:41:34 -07:00
Joseph Hall
483e84c78a
Update HTTP tutorial for new functionality
2015-01-21 09:20:11 -07:00
Joseph Hall
667473c72c
Modify how joyent driver handles SSL and URLs
2015-01-21 08:29:06 -07:00
Joseph Hall
27adbbe8aa
Revert "Allow joyent api host suffix to be configurable"
2015-01-21 08:05:45 -07:00
Thomas S Hatch
602b1a34aa
Merge pull request #19862 from kev009/freebsd-kmods
...
Add freebsdkmod changes to 2014.7.2 relnotes
2015-01-20 16:06:17 -07:00
Thomas S Hatch
dca509eb0d
Merge pull request #19859 from twellspring/develop
...
Documentation fix for Issue 19513.
2015-01-20 16:06:03 -07:00
Colton Myers
88fb2e0036
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/topics/tutorials/starting_states.rst
salt/modules/linux_lvm.py
2015-01-20 15:19:53 -07:00
Colton Myers
1fb6fc0ba1
Fix the explanation of the Default Data - YAML section of starting states
2015-01-20 15:03:54 -07:00
rallytime
99e35ffb1e
Add 2014.7.1 release to Windows Installation Docs
...
Also remove the links to the 2014.7.0 exe's because of regressions.
2015-01-20 12:21:57 -07:00
Kevin Bowling
494543c5bc
Add freebsdkmod changes to 2014.7.2 relnotes
2015-01-20 02:09:32 -07:00
twellspring
e62e36dd57
Update include.rst
2015-01-19 21:02:26 -08:00
twellspring
59c67479ca
Create sls_filename_cant_contain_period.rst
2015-01-19 20:56:49 -08:00
twellspring
cb2bfd6921
Update states_pt1.rst
2015-01-19 20:46:03 -08:00
twellspring
b78dff7011
Update starting_states.rst
2015-01-19 20:19:23 -08:00
Thomas S Hatch
1569520a4b
Merge pull request #19792 from rallytime/merge_forward_develop
...
Merge 2015.2 forward into develop
2015-01-17 09:39:02 -07:00
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
rallytime
d724ed3a47
Merge branch '2015.2' into 'develop'
...
Conflicts:
salt/cli/batch.py
salt/cloud/clouds/msazure.py
tests/integration/netapi/rest_tornado/test_app.py
2015-01-16 11:36:32 -07:00
Colton Myers
d1b201e2bf
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
salt/runners/manage.py
salt/utils/cloud.py
2015-01-15 16:20:48 -07:00
Joseph Hall
56a52f9552
Merge pull request #19752 from rallytime/remove_sshpass_checks
...
Remove sshpass checks
2015-01-15 15:12:00 -07:00
rallytime
4d5cc90c6a
Remove sshpass checks from utils/cloud.py and other references
...
Fixes #19219
2015-01-14 23:08:00 -07:00
Thomas S Hatch
c070a57f8c
Merge pull request #19744 from cachedout/doc_fix
...
Remove a documentation surprise
2015-01-14 16:18:15 -07:00
Mike Place
0ac3e624af
Remove a documentation surprise
2015-01-14 15:28:40 -07:00
Colton Myers
228ada2890
Add release notes for 2014.7.2
2015-01-14 15:17:33 -07:00
Colton Myers
2e364ac249
Add more release notes for 2014.7.1
2015-01-14 15:17:21 -07:00
Erik Johnson
175ba127be
Merge branch '2014.7' into 2014.7-2015.2
...
Conflicts:
salt/modules/archive.py
2015-01-14 14:26:22 -06:00
