Commit Graph

35364 Commits

Author SHA1 Message Date
Thomas S Hatch
339d37a310 Merge pull request #15818 from jacksontj/2014.7
A couple useful features that we should probably include
2014-09-16 09:43:42 -06:00
Thomas S Hatch
5b15a5d6bb Merge pull request #15819 from s0undt3ch/hotfix/protect-from-older-libcloud
Protect against older libcloud versions
2014-09-16 09:43:05 -06:00
Thomas S Hatch
66ac56a0e0 Merge pull request #15813 from terminalmage/issue13878
Encode/Decode unicode characters in cmd.run states
2014-09-16 09:41:58 -06:00
rallytime
85f82816c2 Revert "Put provider specific information only in provider configuration file"
This reverts commit 1ccec204b2.
2014-09-16 08:40:43 -06:00
rallytime
a5c658b337 Disable pylint unused import warning 2014-09-16 07:14:38 -06:00
rallytime
1ccec204b2 Put provider specific information only in provider configuration file 2014-09-16 07:08:18 -06:00
rallytime
2801dfbee4 Rename azure tests to match cloud module and add azure sdk import back in 2014-09-16 06:35:12 -06:00
Pedro Algarvio
fa57f5e89b Split on dots 2014-09-16 05:19:41 +01:00
Thomas Jackson
91de660025 Make sure to handle case where timeout isn't set (misconfigured master?) 2014-09-15 19:24:51 -07:00
rallytime
35793bd8d9 Pylint fix 2014-09-15 20:20:37 -06:00
Thomas Jackson
0197d05439 Add hwm to incoming rep sockets
This will help alleviate problems where clients are unable to auth, and timeout. Those auth requests which "timed out" are still in the master queue and still need to be processed. In ZMQ there is no way to determine if the remote end has disconnected, or still needs the request filled. This will limit the number of requests that are stuck in this backlog state to help alleviate issues when it occurs
2014-09-15 18:59:46 -07:00
Pedro Algarvio
97762f845d Protect against older libcloud versions 2014-09-16 02:25:55 +01:00
Thomas Jackson
9316079bab Append JID to process name within salt-minion 2014-09-15 18:18:51 -07:00
Pedro Algarvio
19a937e59e Merge pull request #15817 from s0undt3ch/2014.7
Add missing import
2014-09-16 01:56:56 +01:00
Pedro Algarvio
d12b0f10c5 Add missing import 2014-09-16 01:56:27 +01:00
Thomas S Hatch
4d8805c368 Merge pull request #15808 from cachedout/issue_14280
Honor __virtualname__
2014-09-15 17:26:07 -06:00
rallytime
b30e750a8a Azure cloud tests
Oh, and rename cloud.profiles.d/azure.sls to cloud.profiles.d/azure.conf
2014-09-15 16:58:26 -06:00
Samuel M Smith
cc13292e66 updating behaviors for new semantics 2014-09-15 16:45:59 -06:00
Samuel M Smith
e15d4f5fdf SaltKeep tests now passing 2014-09-15 16:14:32 -06:00
Thomas S Hatch
cc3c3b4e34 Merge pull request #15811 from s0undt3ch/hotfix/2014.7-gce-disk-type
Allow selecting type of disk when creating instances.
2014-09-15 16:04:55 -06:00
rallytime
a30ccd2a7b Add cloud provider and profile configuration files 2014-09-15 15:57:27 -06:00
rallytime
3e488df321 Cleanup azure docs 2014-09-15 15:50:43 -06:00
Erik Johnson
c77e53e28b Decode output to avoid UnicodeDecodeError 2014-09-15 16:39:20 -05:00
Erik Johnson
9617c58214 Encode unicode kwargs to avoid UnicodeEncodeError 2014-09-15 16:33:01 -05:00
Mike Place
7577520ad8 Fix case where __virtulname__ falls back to True 2014-09-15 15:27:49 -06:00
Thomas S Hatch
a4f3cb2cad Merge pull request #15810 from s0undt3ch/hotfix/2014.7-extra-libcloud-states
Support extra apache-libcloud>0.15 node states
2014-09-15 15:09:51 -06:00
Pedro Algarvio
198bcd9577 Allow selecting type of disk when creating instances.
Additionally also control if the disk is to be deleted on instance
deletion or not.

/cc @erjohnso
2014-09-15 22:08:02 +01:00
Thomas S Hatch
bfbbf3c8e9 Merge pull request #15791 from s0undt3ch/hotfix/2014.7-properly-pass-user-to-syndic
Properly pass user to syndic command.
2014-09-15 14:56:17 -06:00
Thomas S Hatch
d70bb16ed9 Merge pull request #15783 from garethgreenaway/15774_2014_7
Fixes related to to sys.argspec.
2014-09-15 14:55:45 -06:00
Thomas S Hatch
92689e8ec1 Merge pull request #15781 from s0undt3ch/hotfix/2014.7-gce-name-regex
Exit when the VM name does not match the allowed GCE VM names regex
2014-09-15 14:53:48 -06:00
Thomas S Hatch
3274e4da3d Merge pull request #15780 from s0undt3ch/hotfix/2014.7-gce-fixes
`node_data` is a libcloud Node instance which is unsubscriptable
2014-09-15 14:53:32 -06:00
Thomas S Hatch
9ea180fde3 Merge pull request #15779 from s0undt3ch/hotfix/2014.7-filter-backports-UserWarning
Filter the backports package UserWarning about being re-imported
2014-09-15 14:53:04 -06:00
Pedro Algarvio
483e5bb6cd Support extra apache-libcloud>0.15 node states 2014-09-15 21:28:13 +01:00
Mike Place
cf32d4e55b Typo 2014-09-15 14:05:24 -06:00
Mike Place
64e36c50c5 Honor __virtualname__
Honor the __virtualname__ directive if present and __virtual__ return
True.

Refs #14280
2014-09-15 13:40:41 -06:00
Samuel M Smith
391c055f9e Updated SaltKeep to new semantics
Got some tests working
2014-09-15 12:39:18 -06:00
Colton Myers
4371ca3679 Merge pull request #15805 from basepi/rc2release
Edit docs for v2014.7.0rc2 release
2014-09-15 11:46:45 -06:00
Colton Myers
3da7fa06d9 Update release candidate docs with newest rc number 2014-09-15 11:45:56 -06:00
Colton Myers
f502159157 Update sidebar with newest release candidate 2014-09-15 11:45:47 -06:00
Thomas S Hatch
280b27d6a0 Merge pull request #15771 from garethgreenaway/15699_cron_file_newline
Fixes to cron.py state
2014-09-15 10:26:06 -06:00
Nicole Thomas
4546fb0868 Merge pull request #15804 from rallytime/fix_import
Add skipIf import to fix the 2014.7 tests
2014-09-15 08:25:12 -06:00
rallytime
e34157c70b Add skipIf import to fix the 2014.7 tests 2014-09-15 08:23:08 -06:00
Pedro Algarvio
27dad8c53b Merge pull request #15798 from bbinet/patch-1
fix typo in docstring
2014-09-15 09:28:55 +01:00
Bruno Binet
48b299612f fix typo in docstring
s/direcotry/directory/
2014-09-15 10:18:36 +02:00
Pedro Algarvio
57b000d215 Merge pull request #15794 from s0undt3ch/hotfix/disable-problematic-vt-test
Disable `test_issue_10404_ptys_not_released`
2014-09-14 23:55:31 +01:00
Pedro Algarvio
a171a35c89 Disable test_issue_10404_ptys_not_released
Disabled until we can find out why this kills the tests suite with an exit code of 134
2014-09-14 23:54:38 +01:00
Erik Johnson
4bb8b61307 Merge pull request #15782 from s0undt3ch/hotfix/2014.7-gce-fix-format-calls
Fix the `.format()` call indexes
2014-09-14 17:06:15 -05:00
Pedro Algarvio
ccd205b1ea Properly pass user to syndic command.
Refs #15629 and #15608
2014-09-14 17:44:14 +01:00
Mike Place
4b1e24efc4 Merge pull request #15778 from whiteinge/doc-salt-unity-manpage
Added salt-unity manpages
2014-09-14 10:16:42 -06:00
Gareth J. Greenaway
604fd967e1 Fixing #15774, argspec was showing additional functions based on the module that was passed. eg. showing cmd.which and cmd.which_bin when the module cmd.which was passed. This borrows functionality from the sys.doc function for handling this situation. 2014-09-13 15:58:14 -07:00