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
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
