Brandon Weaver
894d8d8c1a
Fix typo
...
Found a minor typo, quick fix.
2015-02-17 13:09:51 -08: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
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
f527cc9fee
Merge pull request #20698 from thatch45/shell_jobber
...
Shell jobber
2015-02-17 10:04:57 -07:00
Barry Laffoy
62bd84f820
adding a new logging handler to support log4mongo
2015-02-17 16:43:15 +00: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
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
jfindlay
535e9f03df
Merge pull request #20746 from rallytime/remove_url_arg
...
Remove unused url arg from __query_ip_address in ec2.py
2015-02-16 21:57:40 -07:00
jfindlay
14d9c9565b
Merge pull request #20738 from donjohnson/patch-1
...
Allow for indented/pretty-printed json output from jinja/simplejson
2015-02-16 21:51:55 -07:00
rallytime
ecaff63539
Remove unused url arg from __query_ip_address in ec2.py
...
Fixes #18457
2015-02-16 20:28:53 -07:00
Nicole Thomas
3ba763c39b
Merge pull request #20744 from cachedout/flo_lint
...
Fix lint errors and typos
2015-02-16 20:08:34 -07:00
Mike Place
2d47da0038
Merge pull request #20745 from cachedout/lint_boto
...
Remove trailing whitespace
2015-02-16 19:33:00 -07:00
Mike Place
ac0f72fb38
Remove trailing whitespace
2015-02-16 20:04:44 -07:00
Mike Place
bc67e2e9c9
Merge pull request #20722 from claudiupopescu/boto-vpc-dns-support
...
Adding DNS support to boto vpc creation
2015-02-16 19:31:19 -07:00
Mike Place
7a35f1ab72
Merge pull request #20730 from tsaridas/elasticache_get_cache_nodes
...
Elasticache get cache nodes
2015-02-16 19:30:32 -07:00
Mike Place
8a4e725495
Merge pull request #20741 from tsaridas/replication_group
...
add option create_replication_group to elasticache
2015-02-16 19:29:37 -07:00
Mike Place
b6bb06c8d6
Fix lint errors and typos
2015-02-16 18:44:20 -07:00
Mike Place
0f2440256a
Merge pull request #20699 from thatch45/beacon_events
...
Beacon events
2015-02-16 18:16:07 -07:00
Mike Place
e63815d4c3
Merge pull request #20700 from thatch45/procmgr_ioflo
...
Procmgr ioflo
2015-02-16 18:05:15 -07:00
Andrea-Redi Tsarida
79c701532b
remove trailing whitespaces
2015-02-17 00:04:33 +01:00
Andrea-Redi Tsarida
61d283c452
add option create_replication_group to elasticache
2015-02-16 23:36:04 +01:00
Andrea-Redi Tsarida
237b313f75
adding name
2015-02-16 23:14:17 +01:00
Don Johnson
b0bbe678c1
Allow for indented/pretty-printed json output from jinja/simplejson
...
While constructing a json config file with a jinja template, I found that my only output option was a json blob. When indent is passed to format_json() (and then down to simplejson.dump), it pretty-prints.
Note that the arg for the indent option changed in simplejson 2.1.0, but according to https://github.com/simplejson/simplejson/blob/master/simplejson/__init__.py#L182 , either a string or integer input is accepted.
2015-02-16 14:02:43 -08:00
Andrea-Redi Tsarida
4e6f2be941
removing functions parameters @ create and add @ get_config
2015-02-16 22:21:07 +01:00
jfindlay
9e7c377858
Merge pull request #20731 from Unity-Technologies/choco-install-args
...
Updated docs for chocolatey
2015-02-16 13:47:46 -07:00
jfindlay
6cf085e218
Merge pull request #20728 from twellspring/patch-5
...
Note eAuth PAM requires root salt-master
2015-02-16 13:44:10 -07:00
jfindlay
c47beeac51
Merge pull request #20707 from russellballestrini/rb-state-archive-user-group
...
state.archive recursively set group
2015-02-16 13:36:34 -07:00
Mike Place
b44f34bce8
Merge pull request #20733 from lovell/debian-ip-iface-type-doc
...
Docs: ensure up/down examples include iface_type
2015-02-16 12:07:46 -07:00
Lovell Fuller
413b3fba4d
Ensure up/down examples include iface_type
2015-02-16 18:58:39 +00:00
Russell Ballestrini
78f96e9329
fixes for pylint
...
modified: salt/states/archive.py
2015-02-16 13:27:59 -05:00
Andrea-Redi Tsarida
a487760b0d
setting show_cache_node_info as True in order to avoid conflicts
2015-02-16 19:09:00 +01:00
Russell Ballestrini
4407de8398
fixes a pylint pep error about whitespace.
...
modified: salt/states/archive.py
2015-02-16 12:43:21 -05:00
