Nitin Madhok
931ece7d20
Fixing some spninx errors and violations
2015-03-31 12:54:32 -04: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
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
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
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
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
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
Erik Johnson
d25677e954
Merge branch '2015.2' into 2015.2-develop
2015-03-10 17:47:30 -05:00
Mike Place
393cf9c13a
Note the change to tcp keepalives in release notes
2015-03-10 10:45:16 -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
rallytime
e9402e7564
Remove "Lithium" and change to "2015.2.0" for versionadded tags
2015-03-05 12:44:22 -07:00
Alexander Schwartz
0887dfe5d8
make latest 2014.7.x releases visible in documentation
2015-03-03 17:14:06 -07:00
Erik Johnson
94d55889d7
Resolve merge conflicts
2015-02-28 12:35:25 -06:00
Justin Findlay
367f14a4d0
add args to cmd.script_retcode
2015-02-27 10:52:15 -07:00
Pedro Algarvio
62f868a076
Merge branch '2015.2' into develop
2015-02-27 10:02:47 +00: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
Joseph Hall
0ff1d027ab
Add Joyent keyname note to release notes
2015-02-19 14:55:13 -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
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
Dennis Hall
478f42d9b2
Change Github to GitHub
2015-02-15 15:19:54 +01:00
Arnold Bechtoldt
cca2563fdf
set appropriate headline for release notes of 2015.2.0
2015-02-12 23:33:37 +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
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
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
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
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
Justin Findlay
b87615e277
document lowercase removal change
2015-02-03 16:27:41 -07: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
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
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
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
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
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
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
Kevin Bowling
494543c5bc
Add freebsdkmod changes to 2014.7.2 relnotes
2015-01-20 02:09:32 -07:00
