C. R. Oldham
f171df4311
Merge forward 2015.2->develop
2015-03-01 19:54: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
