Commit Graph

47422 Commits

Author SHA1 Message Date
Theodore Cowan
54562339c9 update for issue 17062 2015-02-17 15:33:15 -07:00
Mike Place
ec60d03e54 ZeroMQ socket monitoring
This allows a user to log connection events from a ZeroMQ socket to better diagnose connectivity issues. Requires ZeroMQ 4.x.
2015-02-17 15:12:13 -07:00
jfindlay
9f8739c316 Merge pull request #20771 from thatch45/mongo_log
remove redundant import
2015-02-17 14:43:27 -07:00
Justin Findlay
b39f962369 add state module requested state run tests
closes #16901
2015-02-17 14:23:14 -07:00
Justin Findlay
1e36cbb5c4 fix issues with state module requested state runs 2015-02-17 14:23:14 -07:00
Thomas S Hatch
4380a9f86d Merge pull request #20772 from baweaver/patch-1
Fix typo
2015-02-17 14:17:45 -07:00
Brandon Weaver
894d8d8c1a Fix typo
Found a minor typo, quick fix.
2015-02-17 13:09:51 -08:00
Thomas S Hatch
466afa566a remove redundant import 2015-02-17 13:51:41 -07:00
jfindlay
bc157ba2ee Merge pull request #20770 from thatch45/mongo_log
use virtualname and gate the mongo import
2015-02-17 13:41:33 -07:00
Thomas S Hatch
78bb985a59 Merge pull request #20769 from rhealitycheck/feature-update-mongo-future-return
Update mongo_future_return.py
2015-02-17 13:02:44 -07:00
Thomas S Hatch
2c1ee34ab5 use virtualname and gate the mongo import 2015-02-17 12:50:43 -07:00
rhealitycheck
4876b6d6d4 Update mongo_future_return.py
jid is already in load so don't need to have it twice in the same document
2015-02-17 13:29:46 -06:00
Thomas S Hatch
77543aebe2 Merge pull request #20764 from rallytime/bp-20715
Backport #20715 to 2015.2
2015-02-17 11:57:28 -07:00
Thomas S Hatch
8cb08364cb Merge pull request #20766 from rallytime/bp-20179
Backport #20179 to 2015.2
2015-02-17 11:41:22 -07:00
Thomas S Hatch
3ecbc72757 Merge pull request #20763 from mgwilliams/salt_client
import salt.minion in client
2015-02-17 11:41:14 -07:00
Thomas S Hatch
fbb42e7659 Merge pull request #20761 from rallytime/bp-19168
Backport #19168 to 2015.2
2015-02-17 11:41:08 -07:00
Thomas S Hatch
d2ec0e0f8d Merge pull request #20760 from tensorproduct/develop
adding a new logging handler to support log4mongo
2015-02-17 10:49:27 -07:00
Thomas S Hatch
96d50ab34e Merge pull request #20759 from Unity-Technologies/cygwin-windows
Fixed up the use of mirrors with cygwin
2015-02-17 10:48:59 -07:00
rallytime
72b984dc8c Fix versionadded change and add the correct versionadded tags 2015-02-17 10:39:54 -07:00
Russell Ballestrini
db1fa966a1 modified: salt/modules/hg.py 2015-02-17 10:31:38 -07:00
Cimarron Mittelsteadt
819ece0a99 BUG: Removed extra quotes in hg.clone (not needed as cmd is already split as list) which was causing hg to abort on non-local repos like "ssh://...." 2015-02-17 10:31:38 -07:00
Russell Ballestrini
c63546fe33 Added hg identity argument to state and module
We now support supplying a private SSH key path for authentication.

      modified:   salt/modules/hg.py
      modified:   salt/states/hg.py
2015-02-17 10:31:38 -07:00
Robin Wittler
efe044392e fix pylint issues 2015-02-17 10:13:57 -07:00
Robin Wittler
08f74bb4c3 fix file permission errors
* add salt.utils.(get_uid/get_gid) functions
  * extend salt.utils.fopen to make use of
    uid, gid and mode keyword arguments.
  * extend SAuth.verify_signing_master method so it
    uses now salt.utils.get_uid and calls
    salt.utils.fopen with the uid keyword

  extend minion.get_proc_dir:
    * add kwargs to function signature
    * extend doc string
    * handle mode in os.makedirs
    * check if mode of existing dir needs to be changed
    * check if uid/gid needs to be changed (only if os.chmod is
    * available)

  * extend minion.Minion.__init__ to call minion.get_proc_dir with kwargs
  * extend minion.Proxyminion.__init__ to call minion.get_proc_dir with kwargs
2015-02-17 10:13:57 -07:00
Thomas S Hatch
f527cc9fee Merge pull request #20698 from thatch45/shell_jobber
Shell jobber
2015-02-17 10:04:57 -07:00
Matthew Williams
23450f90ae import salt.minion in client 2015-02-17 17:00:45 +00:00
Arnold Bechtoldt
4df6f5017f fixing lint error PEP8 E712 2015-02-17 09:53:51 -07:00
Arnold Bechtoldt
58fbb2a263 Enhance ssh.user_keys to skip private key file exports 2015-02-17 09:53:51 -07:00
Barry Laffoy
62bd84f820 adding a new logging handler to support log4mongo 2015-02-17 16:43:15 +00:00
Daniel Hobley
efe48b2a27 Fixes for pylint 2015-02-17 17:42:27 +01:00
Thomas S Hatch
85e23f0edc Merge pull request #20715 from robin-wittler/fix_file_permission_errors
fix file permission errors
2015-02-17 09:14:29 -07:00
Thomas S Hatch
59640a051d Merge pull request #20694 from cachedout/sync_module_async
Allow saltutil.refresh_modules to wait for completion
2015-02-17 09:10:58 -07:00
Thomas S Hatch
160b60e59e Merge branch 'develop' into shell_jobber 2015-02-17 09:09:04 -07:00
Nicole Thomas
e190909055 Merge pull request #20755 from jayeshka/modjk-unit-test
adding modjk unit test case
2015-02-17 08:38:47 -07:00
jfindlay
0c6b89e81c Merge pull request #20756 from jayeshka/npm-unit-test
adding npm unit test case
2015-02-17 08:38:26 -07:00
Nicole Thomas
c398669a6e Merge pull request #20754 from jayeshka/swift-unit-test
adding swift unit test case
2015-02-17 08:37:51 -07:00
Nicole Thomas
87b019bc8c Merge pull request #20753 from jayeshka/sdb-unit-test
adding sdb unit test case
2015-02-17 08:36:52 -07:00
jfindlay
d1068f5c14 Merge pull request #20752 from jayeshka/ret-unit-test
adding ret unit test case
2015-02-17 08:36:42 -07:00
jfindlay
1a5c187945 Merge pull request #20751 from jayeshka/openstack_config-unit-test
adding openstack_config unit test case
2015-02-17 08:35:42 -07:00
Claudiu Popescu
251c5108ac Fixes state if VPC already present 2015-02-17 16:34:57 +01:00
Daniel Hobley
bdafb0b4e0 Fixed up the use of mirrors with cygwin
- Simplified the use of cygcheck to look for packages that are already installed
- Added documentation for adding mirrors to a cygwin state/module
2015-02-17 16:30:32 +01:00
Joseph Hall
0fb64237f7 Merge pull request #20758 from mrchilds/develop
Added required update
2015-02-17 07:34:45 -07:00
Wes Childs
020b8698ec Added required update 2015-02-17 14:32:21 +00:00
Jayesh Kariya
35a25e1ad6 adding sdb unit test case 2015-02-17 18:20:58 +05:30
Jayesh Kariya
f38fe3a34e adding ret unit test case 2015-02-17 18:19:04 +05:30
Jayesh Kariya
0e3a86f84b adding openstack_config unit test case 2015-02-17 18:17:10 +05:30
Jayesh Kariya
b25fc47126 adding npm unit test case 2015-02-17 18:14:15 +05:30
Jayesh Kariya
17796ca5b4 adding modjk unit test case 2015-02-17 18:12:01 +05:30
Jayesh Kariya
5098a63fd1 adding swift unit test case 2015-02-17 18:09:33 +05:30
Claudiu Popescu
bbcfece05f Fixes pylint 2015-02-17 12:17:43 +01:00