Flavian
f3daf2c780
Ssh_port should be an int in deploy_kwargs.
...
Also contesting for the shortest pull request ever.
2015-01-27 18:41:36 +01:00
Thomas S Hatch
5867959cf4
Merge pull request #20088 from basepi/merge-forward-2015.2
...
Merge forward from 2014.7 to 2015.2
2015-01-27 10:04:39 -07:00
Thomas S Hatch
c56654510e
Merge pull request #20072 from techhat/joyenthttp
...
Switch Joyent to salt.utils.http.query()
2015-01-27 09:58:05 -07:00
Thomas S Hatch
21fc5049ed
Merge pull request #20070 from techhat/pagerdutyhttp
...
Switch PagerDuty to salt.utils.http.query()
2015-01-27 09:56:55 -07:00
Thomas S Hatch
d1d5676999
Merge pull request #20069 from techhat/httputils
...
Fixup header handling in http.query()
2015-01-27 09:56:45 -07:00
Thomas S Hatch
9ce1155b45
Merge pull request #20071 from techhat/githubhttp
...
Switch GitHub to salt.utils.http.query()
2015-01-26 20:37:30 -07:00
Thomas S Hatch
11a1506f12
Merge pull request #20089 from lyft/lyft-boto-dynamodb-2015.2
...
add boto dynamodb salt module and state
2015-01-26 20:34:16 -07:00
Thomas S Hatch
c86aa162ac
Merge pull request #20092 from thatch45/beacons
...
Beacons!!!!
2015-01-26 20:33:54 -07:00
Thomas S Hatch
934fb002f4
Merge pull request #6 from rallytime/beacons
...
Add beacons section to 2015.2.0 release notes
2015-01-26 20:32:46 -07:00
rallytime
80bfa4a2a6
Add beacons section to 2015.2.0 release notes
2015-01-26 20:26:51 -07:00
Mike Demmitt
51407036d9
fixing lint errors
2015-01-26 17:43:58 -08:00
Thomas S Hatch
e003927423
Merge pull request #5 from whiteinge/beacons-doc
...
Added beacon docs
2015-01-26 18:40:20 -07:00
Seth House
8e476bc455
Fixed typos in the beacon docs
2015-01-26 18:20:54 -07:00
Seth House
2f7376ad6b
Added __virtual__ and __virtualname__ to inotify beacon module
2015-01-26 18:19:34 -07:00
Seth House
b777d3cba1
Added unique identifier for the beacon docs
2015-01-26 18:19:34 -07:00
Seth House
a26aef0d7d
Added beacon module docs to the module index
2015-01-26 18:19:34 -07:00
Seth House
127ddb6d9c
Added cross-references to the inotify beacon module
2015-01-26 18:19:34 -07:00
Thomas S Hatch
185856ddbb
don't fire master events if the queue is empty!
2015-01-26 17:31:48 -07:00
Thomas S Hatch
1421ed22d8
need to have a frame to start things later on
2015-01-26 17:19:46 -07:00
Thomas S Hatch
9ec62ad249
handle typos
2015-01-26 17:12:01 -07:00
Thomas S Hatch
5affea1022
Merge branch '2015.2' into beacons
2015-01-26 16:57:43 -07:00
Mike Demmitt
6b04c3d67a
add boto dynamodb salt module and state
2015-01-26 15:12:35 -08:00
Colton Myers
ce9d2cb6cb
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
.pylintrc
.testing.pylintrc
salt/states/file.py
salt/utils/__init__.py
2015-01-26 15:53:05 -07:00
Thomas S Hatch
f254f1fb10
Merge pull request #20041 from rallytime/fix_dulwich_check
...
dulwich.__version__ returns a tuple of ints instead of a string
2015-01-26 15:27:42 -07:00
Colton Myers
1371f4be6f
Merge pull request #20084 from basepi/outputtererror20077
...
Default to nested for outputter of '' [2015.2]
2015-01-26 15:26:37 -07:00
Thomas S Hatch
11ae0173a9
Merge pull request #20057 from basepi/merge-forward-2015.2
...
Merge forward from 2014.7 to 2015.2
2015-01-26 15:26:23 -07:00
Thomas S Hatch
074c408a51
Add __instance_id__ to pylint checks as this has been added to
...
the active state runs for state run tracking
2015-01-26 15:22:18 -07:00
Colton Myers
da6d25e13c
Default to nested for outputter of ''
...
Fixes #20077
2015-01-26 15:15:20 -07:00
Joseph Hall
93bce8c022
Remove dep on requests
2015-01-26 13:52:04 -07:00
Joseph Hall
8cfb6ad5dd
Switch Joyent to salt.utils.http.query()
2015-01-26 13:45:28 -07:00
Joseph Hall
0ab9fb6197
Switch GitHub to salt.utils.http.query()
2015-01-26 13:44:31 -07:00
Joseph Hall
7d94b2e266
Switch PagerDuty to salt.utils.http.query()
2015-01-26 13:43:09 -07:00
Joseph Hall
f024bd8b75
Fixup header handling in http.query()
2015-01-26 13:40:07 -07:00
Colton Myers
b201f1353c
is None
2015-01-26 12:45:14 -07:00
Thomas S Hatch
9567d744f2
Merge pull request #19622 from s0undt3ch/hotfix/lithium-deprecations
...
[2015.2] lithium deprecations
2015-01-26 12:08:48 -07:00
rallytime
50b99a5902
Use tuple comparison, not LooseVersion
2015-01-26 10:37:49 -07:00
Thomas S Hatch
c5ac604b56
Merge pull request #20046 from hvnsweeting/2014.7
...
bugfix: persist accumulator data after reload_modules, fix #8881
2015-01-26 10:30:38 -07:00
Colton Myers
916bef0d4b
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
salt/states/file.py
2015-01-26 10:20:10 -07:00
Pedro Algarvio
0dbb8f320d
Remove deprecated quiet option leftover
2015-01-26 02:30:35 +00:00
Thomas S Hatch
ea507c8cc3
should wait until ioflo is updated with the new deck option
2015-01-25 09:41:14 -07:00
Thomas S Hatch
4809848dad
fix some typos
2015-01-25 09:35:47 -07:00
Thomas S Hatch
658045ba20
fix raet regression that is still on the 2015.2 branch
2015-01-25 09:31:36 -07:00
Thomas S Hatch
828906d62d
Merge branch '2015.2' into beacons
2015-01-25 09:26:43 -07:00
Hung Nguyen Viet
ca907b4b41
bugfix: persist accumulator data after reload_modules, fix #8881
2015-01-25 15:49:05 +07:00
rallytime
9dd00b447e
Pylint fix
2015-01-24 19:20:31 -07:00
rallytime
6669e25a18
dulwich.__version__ returns a tuple of ints instead of a string
...
LooseVersion expects a string, so it was stacktracing. This should fix that right up.
2015-01-24 17:28:05 -07:00
Thomas S Hatch
8dde786e33
update minion floscript for beacon system
2015-01-24 00:22:06 -07:00
Thomas S Hatch
db73ea8ed0
Add saltraetmasterevents behavior
2015-01-24 00:13:56 -07:00
Thomas S Hatch
0589b4adf9
Add initial beacon behaviors for salt-raet
...
Salt raet does not have a convenience function for firing events
on the master, so we stil need a behavior for it, this should be
the last thing for beacons
2015-01-23 23:46:19 -07:00
Thomas S Hatch
54529a9aa2
Add initial documentation
2015-01-23 23:11:34 -07:00
