Justin Findlay
03af523de9
Merge pull request #22853 from s0undt3ch/2014.7
...
Don't assume package installation order.
2015-04-20 20:42:41 -06:00
Justin Findlay
9211e36564
Merge pull request #22877 from s0undt3ch/hotfix/clean-docs-fix
...
Don't fail on `make clean` just because the directory does not exist
2015-04-20 20:40:47 -06:00
Justin Findlay
2e07cc6dcd
Merge pull request #22876 from twangboy/add_graphic
...
Add graphic
2015-04-20 20:40:16 -06:00
Justin Findlay
5bdbd08bbd
Merge pull request #22873 from thatch45/type_check
...
Type check the version since it will often be numeric
2015-04-20 20:38:11 -06:00
Justin Findlay
ea2fd50660
increase timeout and tries for route53 records
...
Fixes #18720 .
2015-04-20 19:26:24 -06:00
salt_build
7235bb0b68
Removed some parenthesis
2015-04-20 23:59:33 +00:00
salt_build
a4e24f5c6a
Added new panel graphic to installer
2015-04-20 23:56:11 +00:00
Pedro Algarvio
95d6887949
Don't fail on make clean just because the directory does not exist
2015-04-21 00:46:09 +01:00
Thomas S Hatch
53b8376626
Type check the version since it will often be numeric
2015-04-20 17:27:24 -06:00
Shane Lee
c965b0a035
Merge pull request #22870 from twangboy/fix_installer_again
...
Added ability to send a version with a space in it
2015-04-20 17:18:28 -06:00
Thomas Jackson
2c760f262b
Add failhard option to salt batching
...
This resolves #11721
In addition, this consolidates the determining of retcodes into a utils library
2015-04-20 16:16:54 -07:00
Colton Myers
9688c8fc76
Merge pull request #22866 from basepi/salt-ssh.cp.makedirs.22751
...
[2015.2] Add missing args to cp.get_file in salt-ssh
2015-04-20 16:38:39 -06:00
rallytime
c88a1ea243
Prevent stacktrace on os.path.exists in hosts module
...
If hfn is None, it will stacktrace in os.path.exists. Change it
to an empty string.
2015-04-20 16:21:24 -06:00
Thomas S Hatch
adb21a64b1
py3 compat for cassanra_cql
2015-04-20 16:18:30 -06:00
Nicole Thomas
927be7daea
Merge pull request #22861 from basepi/merge-forward-2015.2
...
[2015.2] Merge forward from 2014.7 to 2015.2
2015-04-20 16:18:02 -06:00
Thomas S Hatch
6bfd57a921
Merge pull request #22868 from nmadhok/bugfix
...
Backport #22860 to 2015.2
2015-04-20 16:07:30 -06:00
salt_build
3f180cfaae
Added ability to send a version with a space in it
2015-04-20 21:55:57 +00:00
Colton Myers
c235e0376b
Import CommandExecutionError
2015-04-20 15:52:25 -06:00
Nitin Madhok
eeb42849f8
Backport #22860
2015-04-20 17:21:49 -04:00
Colton Myers
c925057e8e
Add template, makedirs, and gzip arguments to cp.get_file (in salt-ssh)
...
Fixes #22751
2015-04-20 14:53:19 -06:00
Shane Lee
cb999c7d70
Update pip.py
...
Added a 'r' to account for the backslashes
2015-04-20 14:19:49 -06:00
Colton Myers
388773010a
Add makedirs arg to shell.send
2015-04-20 14:03:24 -06:00
Justin Findlay
2973eb18bc
Merge pull request #22863 from rallytime/bp-20974
...
Backport #20974 to 2014.7
2015-04-20 13:29:37 -06:00
Justin Findlay
3e8ebfe38e
Merge pull request #22859 from whiteinge/salt-api-upstart
...
Back-ported salt-api upstart script from develop
2015-04-20 13:28:18 -06:00
Johannes Ebke
14913a4cb4
Fix expr_match usage in salt.utils.check_whitelist_blacklist
2015-04-20 12:24:01 -06:00
Colton Myers
1f9934c634
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/topics/installation/windows.rst
doc/topics/tutorials/gitfs.rst
2015-04-20 11:39:41 -06:00
Seth House
419a483750
Back-ported salt-api upstart script from develop
...
Added in ffe1ba6
2015-04-20 11:11:35 -06:00
Thomas S Hatch
d5d1ddc8d6
Merge pull request #22705 from jayeshka/win_dns_client_unit_test
...
adding win_dns_client test case and used @patch for mocking.
2015-04-20 09:50:22 -06:00
Thomas S Hatch
9599795bf0
Merge pull request #22828 from cro/svcbeacon_features
...
Add onchangeonly and uncleanshutdown to service beacon
2015-04-20 09:40:41 -06:00
Justin Findlay
3651d21ad4
Merge pull request #22743 from jayeshka/netscaler-unit-test
...
adding netscaler unit test case
2015-04-20 09:25:17 -06:00
Thomas S Hatch
c45b92bb4b
Merge pull request #22578 from hvnsweeting/2014-7-fix-compile-pillar
...
gracefully handle when salt-minion cannot decrypt key
2015-04-20 09:24:44 -06:00
Thomas S Hatch
0525f17c50
Merge pull request #22683 from matdrapeau/22682_deploy_key_machine_id
...
Making ssh-copy-id using the provided machine name and not ip
2015-04-20 09:23:44 -06:00
Thomas S Hatch
e197e491d5
Merge pull request #22819 from msteed/issue-21615
...
cli: don't report syndics as unresponsive minions
2015-04-20 09:15:32 -06:00
Thomas S Hatch
a7ff60491b
Merge pull request #22815 from plastikos/issue-22797
...
Fix failure with nested nodegroups:
2015-04-20 09:12:54 -06:00
Pedro Algarvio
b62df62151
Don't assume package installation order.
...
Additionally pep8 when installed using wheel, reports the version
together with the name.
2015-04-20 14:45:25 +01:00
Étienne BERSAC
31b98e72eb
Initialize state file client after pillar loading
2015-04-20 15:14:05 +02:00
Étienne BERSAC
f6bebb7a31
Use saltenv
2015-04-20 15:14:05 +02:00
Jayesh Kariya
446121750d
adding states/artifactory unit test case
2015-04-20 16:02:46 +05:30
Jayesh Kariya
58ffc0c756
adding states/augeas unit test case
2015-04-20 16:01:10 +05:30
Jayesh Kariya
be7e2e9202
adding states/at unit test case
2015-04-20 15:59:27 +05:30
Jayesh Kariya
e06343bc18
adding states/apt unit test case
2015-04-20 15:57:54 +05:30
Jayesh Kariya
619dd5cce8
adding states/apache unit test case
2015-04-20 15:56:31 +05:30
C. R. Oldham
1f49663eb7
Make sure we are checking for the right dictionary entry
2015-04-18 22:02:54 -06:00
C. R. Oldham
6a4a399897
Lint.
2015-04-18 13:20:38 -06:00
Justin Findlay
900c7a510f
Merge pull request #22800 from terminalmage/issue21979
...
Improve error logging for pygit2 SSH-based remotes
2015-04-18 11:18:55 -06:00
C. R. Oldham
bbaed57edb
Add onchangeonly and uncleanshutdown parameters to service beacon.
2015-04-18 10:56:46 -06:00
Justin Findlay
e99f2fdb28
Merge pull request #22813 from twangboy/win_doc_fix
...
Updated instructions for building salt
2015-04-17 22:10:07 -06:00
Erik Johnson
8f1c0084cd
Clarify that for pygit2, receiving 0 objects means repo is up-to-date
...
This seems to be too confusing to users, so this changes the log message
to say that the repo is up-to-date instead of saying that 0 objects were
received.
2015-04-17 22:11:40 -05:00
Viet Hung Nguyen
f75b24ad68
gracefully handle when salt-minion cannot decrypt key
...
or salt-minion will die. Returns None to deligate
this job to compile_pillar function handle it,
as it is the only caller of this function for now
2015-04-18 09:52:36 +07:00
Thayne Harbaugh
b37b6b2849
Add a test for incorrectly-nested nodegroups that cause a resolution loop.
2015-04-17 17:01:47 -06:00
