rallytime
2b44f612c0
Remove sshpass check in nova driver
2015-01-14 23:25:02 -07:00
rallytime
e9d32c562b
Remove sshpass checks in rackspace driver
2015-01-14 23:21:38 -07:00
rallytime
f748ac56f4
Remove sshpass check in joyent driver
2015-01-14 23:19:06 -07:00
Thomas S Hatch
421368ec51
create the crypticle on the worker so we don't need to serialize
...
Python objects
2015-01-14 23:19:01 -07:00
rallytime
65ce51611b
Remove sshpass checks from saltify
2015-01-14 23:13:28 -07:00
rallytime
c76326076f
Remove sshpass checks from gogrid
2015-01-14 23:11:29 -07:00
rallytime
4d5cc90c6a
Remove sshpass checks from utils/cloud.py and other references
...
Fixes #19219
2015-01-14 23:08:00 -07:00
Thomas Jackson
2e72f5ff38
Remove *insane* 7200s timeout (2h).
...
If the pillar isn't back in the regular 1m its probably busted, if not we can set this timeout to something else, but 2h seems excessive.
I've found a few minions stuck in this code block, since the minion's main process can get stuck here waiting for 2 hours.
2015-01-14 21:22:40 -08:00
Joseph Hall
f42d6974c8
Move --set-xmark after iptables jump
2015-01-14 20:15:14 -07:00
Ryan Lane
6b105f1861
Initial grafana state and elasticache execution modules
2015-01-14 18:51:45 -08:00
Nicole Thomas
65ae9455e1
Merge pull request #19747 from s0undt3ch/2015.2
...
No logging should be done in `__virtual__`
2015-01-14 19:49:15 -07:00
Nicole Thomas
ab9408d271
Merge pull request #19740 from terminalmage/2014.7-2015.2
...
Merge forward 2014.7 into 2015.2
2015-01-14 19:48:12 -07:00
Joseph Hall
6cd5baaf62
More linting, and fixing hardcoded host
2015-01-15 02:08:46 +00:00
Joseph Hall
034bbe45b0
Linting
2015-01-15 01:47:00 +00:00
Pedro Algarvio
435afb6e26
No logging should be done in __virtual__
2015-01-15 01:22:35 +00:00
Joseph Hall
7f0e4a3c5b
Iterate through a list of known paths for ca_bundle
2015-01-15 01:18:07 +00:00
Mathias Gug
64cf74ebaa
Fix style.
2015-01-14 16:05:36 -08:00
Mathias Gug
6ffc9f827e
Fix style.
2015-01-14 16:04:25 -08:00
Mathias Gug
e5ab359bdd
Fix style issues.
2015-01-14 16:02:50 -08:00
Mathias Gug
5c631d5915
Remove reference to SQS.
2015-01-14 15:44:50 -08:00
Mathias Gug
6f9fbe23d6
Add boto_sns module and state.
...
Include integration tests.
2015-01-14 15:43:06 -08:00
Thomas S Hatch
4158b17208
Merge pull request #19741 from basepi/saltssh.jinja.newconvention.19681
...
Fix FunctionWrapper to allow for jinja salt.cmd.run() syntax
2015-01-14 16:21:41 -07:00
Thomas S Hatch
3a89e67488
Merge pull request #19735 from lyft/add-aws-account-id-function
...
Add get_account_id function boto_iam
2015-01-14 16:20:36 -07:00
Thomas S Hatch
c070a57f8c
Merge pull request #19744 from cachedout/doc_fix
...
Remove a documentation surprise
2015-01-14 16:18:15 -07:00
Joseph Hall
b59ac43c57
Default http.query() to urllib2, but still allow requests
2015-01-14 22:56:27 +00:00
Mike Place
0ac3e624af
Remove a documentation surprise
2015-01-14 15:28:40 -07:00
Colton Myers
dcf9128a2d
Merge pull request #19743 from basepi/2014.7.2releasenotes
...
Add more release notes for 2014.7.1 and 2014.7.2
2015-01-14 15:18:04 -07:00
Colton Myers
228ada2890
Add release notes for 2014.7.2
2015-01-14 15:17:33 -07:00
Colton Myers
2e364ac249
Add more release notes for 2014.7.1
2015-01-14 15:17:21 -07:00
Colton Myers
3b29fa0d05
Remove msgpack from thin generation for salt-ssh
2015-01-14 14:21:17 -07:00
Mathias Gug
97d0f93fd3
Fix coding style.
2015-01-14 13:06:43 -08:00
Colton Myers
fa5dd4127d
Fix FunctionWrapper to allow for jinja salt.cmd.run() syntax
...
Fixes #19681
2015-01-14 13:42:38 -07:00
Erik Johnson
175ba127be
Merge branch '2014.7' into 2014.7-2015.2
...
Conflicts:
salt/modules/archive.py
2015-01-14 14:26:22 -06:00
Mathias Gug
30625a0437
Skip boto_iam integration tests if boto is not available
...
or properly configured.
2015-01-14 11:49:54 -08:00
Mathias Gug
a39df43a48
Fix coding style violations.
2015-01-14 11:49:43 -08:00
Thomas S Hatch
0b6a1ffd3c
Merge pull request #19733 from cachedout/pydsl_fixing
...
Fix malformed exception handling
2015-01-14 12:41:23 -07:00
Thomas S Hatch
7041530111
Merge pull request #19725 from rupeshta/firewalld_unit_tests
...
test firewalld tests
2015-01-14 12:18:59 -07:00
Thomas S Hatch
bc639a9f75
Merge pull request #19723 from jayeshka/data_unit_tests
...
Added unit test for data
2015-01-14 12:18:31 -07:00
Thomas S Hatch
58154bb817
Merge pull request #19721 from terminalmage/2014.7-archive-fixes
...
Remove 'recurse' argument from archive.zip
2015-01-14 12:17:28 -07:00
Thomas S Hatch
7d5d095bae
Merge pull request #19719 from terminalmage/archive-fixes
...
Fix archive.zip, archive.unzip
2015-01-14 12:16:55 -07:00
Thomas S Hatch
4e79364821
Merge pull request #19717 from sjansen/patch-4
...
Enable salt-cloud bootstrap with ssh gateway
2015-01-14 12:15:16 -07:00
Thomas S Hatch
9df5e5b4e2
Merge pull request #19718 from sjansen/patch-5
...
Enable salt-cloud bootstrap with ssh gateway
2015-01-14 12:13:28 -07:00
Mathias Gug
61eeac5465
Add comment.
2015-01-14 11:12:23 -08:00
Thomas S Hatch
5a3bd60867
Merge pull request #19715 from kev009/freebsd-kmods
...
Switch FreeBSD kmod module to use loader.conf
2015-01-14 12:12:20 -07:00
Thomas S Hatch
4aae1ec9a4
Merge pull request #19713 from cachedout/runner_doc
...
Some docs on runners
2015-01-14 12:11:45 -07:00
Thomas S Hatch
1e9a213bdb
Merge pull request #19705 from cachedout/issue_19364
...
Warn about unsupported vt in cmd mod
2015-01-14 12:11:25 -07:00
Thomas S Hatch
060042d3c7
Merge pull request #19703 from cachedout/issue_19535
...
Return unique list of minions to be batched.
2015-01-14 12:09:34 -07:00
Thomas S Hatch
d204fe4f8e
Merge pull request #19698 from basepi/filemanagedcontents19669
...
Force contents to string under Falsey conditions too for file.managed
2015-01-14 12:09:14 -07:00
Mathias Gug
3ff36a9692
Add get_account_id function boto_iam
...
so that we can retrieve the AWS account id associated with the
credentials used to connect to AWS.
2015-01-14 11:08:54 -08:00
Mike Place
6a2330a85e
Fix malformed exception handling
2015-01-14 11:03:21 -07:00