Colton Myers
dd61682968
Fix runtests permissions
2015-01-23 14:22:19 -07:00
Colton Myers
ab41da0e23
Satisfy OCD
2015-01-23 14:21:42 -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
75fa353619
Merge pull request #20006 from rallytime/pylint_fifteen
...
Pylint fixes for the 2015.2 branch
2015-01-23 14:06:49 -07:00
Thomas S Hatch
6d9244fa04
Merge pull request #20008 from rallytime/pylint_develop
...
Pylint fix for develop
2015-01-23 14:02:25 -07:00
Mike Place
41aac973a8
Merge pull request #20007 from cachedout/fix_environ_test
...
Let's see if this is any better in jenkins
2015-01-23 11:58:48 -07:00
rallytime
523295f4f0
Pylint fix for develop
2015-01-23 11:02:14 -07:00
Mike Place
545e17c8f5
Let's see if this is any better in jenkins
2015-01-23 11:00:13 -07:00
rallytime
69d7a6ebd0
Pylint fixes for the 2015.2 branch
2015-01-23 10:57:18 -07:00
Thomas S Hatch
d7a0405a56
Merge pull request #19995 from rupeshta/influx_unit_tests
...
implemented unit test cases for influx module
2015-01-23 10:41:43 -07:00
Thomas S Hatch
45b743db50
Merge pull request #19989 from steverweber/develop
...
accept installing no packages
2015-01-23 10:40:38 -07:00
Thomas S Hatch
15e9c2f4b1
Merge pull request #19987 from jacksontj/aes_cleanup
...
Remove verify_* from all the non-daemon CLI scripts
2015-01-23 10:39:39 -07:00
Rupesh Tare
3cb7b874ac
implemented unit test cases for influx module
2015-01-23 17:59:22 +05:30
Steve Weber
b89485d460
accept installing no packages
...
accept installing no packages.. This helps make salt formulas more simple.
2015-01-22 23:46:03 -05:00
Thomas S Hatch
94e441e7e1
Merge pull request #19327 from jmdcal/error_reporting
...
top file error checking
2015-01-22 20:20:45 -07:00
Thomas S Hatch
5a9e8cb506
Merge pull request #19986 from s0undt3ch/issues/19764
...
Log the daemons start ups and shut downs.
2015-01-22 20:19:13 -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
Thomas S Hatch
dc3bf87696
Merge pull request #19976 from oldmantaiter/mount-by-label
...
Add compatibility to mount by label
2015-01-22 20:00:42 -07:00
Thomas S Hatch
19b8c20ac6
Merge pull request #19981 from basepi/merge-forward-2015.2
...
Merge forward from 2014.7 to 2015.2
2015-01-22 20:00:11 -07:00
Thomas S Hatch
7a6c9f0190
Merge pull request #19985 from cachedout/runner_linger
...
Fix two problems with runners
2015-01-22 19:58:14 -07:00
Thomas Jackson
7fa1a9c815
Remove verify_* from all the non-daemon CLI scripts
...
In the current implementation any call to these would cause the script to traverse *every* salt file on the box. Primarily problematic for salt-run on a master with a large number of minions as part of verify_env touched *each* minion's key
2015-01-22 18:53:27 -08:00
Pedro Algarvio
c08dbd7ca3
Log the daemons start ups and shut downs.
...
Fixes #19764
2015-01-23 02:13:52 +00:00
Thomas S Hatch
f57134c073
Merge pull request #19974 from rallytime/bp-19768
...
Backport #19768 to 2015.2
2015-01-22 17:55:34 -07:00
Thomas S Hatch
9cdbf2b2f7
Merge pull request #19972 from rallytime/bp-19746
...
Backport #19746 to 2015.2
2015-01-22 17:55:27 -07:00
Thomas S Hatch
d44453fb31
Merge pull request #19971 from rallytime/bp-19735
...
Backport #19735 to 2015.2
2015-01-22 17:55:19 -07:00
Thomas S Hatch
c851b9825c
Merge pull request #19966 from rallytime/merge_forward_develop
...
Merge 2015.2 forward to develop
2015-01-22 17:54:21 -07:00
Thomas S Hatch
54a394d4e6
Merge pull request #19965 from lyft/support-sns-subscriptions
...
Support sns subscriptions
2015-01-22 17:53:28 -07:00
Mike Place
389fb7e030
Fix two problems with runners
...
First, the daemonization process would sometimes hang on redirection.
Second, it appears there is a race betwen the deletion of the zmq socket
and the event firing. Normally, this should be handled by the zmq.linger
but that appears not to work correctly when the multiproc exits out from
underneath it.
2015-01-22 17:52:08 -07:00
Thomas S Hatch
5897e79c41
Merge pull request #19984 from jasonm-makerbot/patch-1
...
Update index.rst
2015-01-22 17:47:57 -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
c391f880eb
Merge pull request #19982 from basepi/2014.7.1release
...
Release 2014.7.1 (docs sidebar and release date for release notes)
2015-01-22 16:52:56 -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
Samuel Smith
98ab9af354
Merge pull request #19979 from SmithSamuelM/sam_20150122
...
Fixed conflict More preparatory work for master cluster
2015-01-22 16:03:47 -07:00
Samuel M Smith
29d705951d
Merge remote-tracking branch 'upstream/develop' into sam_20150122
...
Conflicts:
salt/daemons/flo/core.py
2015-01-22 16:00:11 -07:00
Samuel M Smith
72b95f9b02
even more predatory ;) master cluster work
2015-01-22 15:52:51 -07:00
Tait Clarridge
e314bd637e
Add compatibility to mount by label
...
Previously this would always force a remount as label was missing from the extended mount.active function.
2015-01-22 17:48:11 -05:00
Ryan Lane
5d008aa799
CLI examples and docstrings
2015-01-22 14:49:30 -07:00
Ryan Lane
f875d23cc1
Fix lint error
2015-01-22 14:49:30 -07:00
Ryan Lane
31c69421cc
Initial grafana state and elasticache execution modules
2015-01-22 14:49:30 -07:00
Mathias Gug
b3e94b6683
Add documentation.
...
Fix style.
2015-01-22 14:41:19 -07:00
Mathias Gug
6f13d6feca
Document remaining module functions.
2015-01-22 14:41:13 -07:00
Mathias Gug
4670988a68
Fix style.
2015-01-22 14:41:05 -07:00
Mathias Gug
3b285798e3
Fix style.
2015-01-22 14:40:58 -07:00
Mathias Gug
dd097b730d
Fix style issues.
2015-01-22 14:40:49 -07:00
Mathias Gug
228ea72251
Remove reference to SQS.
2015-01-22 14:40:43 -07:00
Mathias Gug
4542072c4e
Add boto_sns module and state.
...
Include integration tests.
2015-01-22 14:40:32 -07:00
