Thomas S Hatch
|
105c2f97a5
|
Lint per #13582
|
2014-06-20 09:54:45 -06:00 |
|
Thomas S Hatch
|
8bbcb3b8a2
|
Merge pull request #13582 from steverweber/fix_autorestart
move restart code to salt.Minion().Start()
|
2014-06-20 09:53:45 -06:00 |
|
Samuel Smith
|
93ab75b11d
|
Merge pull request #13602 from SmithSamuelM/sam_raet_46
Salt Raet now allows the master to reboot and will rejoin with minions
|
2014-06-20 09:46:44 -06:00 |
|
Mathieu Le Marec - Pasquet
|
a408f5d477
|
correct docstrings
|
2014-06-20 17:42:06 +02:00 |
|
Seth House
|
b98c6aa19e
|
Merge pull request #13600 from s0undt3ch/hotfix/netapi-test-fixes
Under Py2.6 we need unittest2 to be able to access `assertRaisesRegexp`
|
2014-06-20 09:39:38 -06:00 |
|
Samuel M Smith
|
6a73ab71e3
|
Stubbed out missing .destroy method
|
2014-06-20 09:39:08 -06:00 |
|
Mathieu Le Marec - Pasquet
|
5ea682cc21
|
lower log in cmd
|
2014-06-20 17:35:11 +02:00 |
|
Samuel M Smith
|
e592031930
|
Merge remote-tracking branch 'upstream/develop' into sam_raet_46
|
2014-06-20 09:32:06 -06:00 |
|
Seth House
|
dc10772094
|
Merge pull request #13601 from s0undt3ch/hotfix/setup-netapi
Install the `salt-api` scripts. Refs #13554
|
2014-06-20 09:27:55 -06:00 |
|
Seth House
|
b37493075f
|
Merge pull request #13595 from s0undt3ch/issues/13592-netapi-saltclient
`saltclients` is now a `MixIn` and not a global variable. Fixes #13592.
|
2014-06-20 09:26:53 -06:00 |
|
Pedro Algarvio
|
2ed40ac6f3
|
Install the salt-api scripts. Refs #13554
|
2014-06-20 16:21:31 +01:00 |
|
Pedro Algarvio
|
df80f4facb
|
Under Py2.6 we need unittest2 to be able to access assertRaisesRegexp
|
2014-06-20 14:26:24 +01:00 |
|
Joseph Hall
|
2fad262ced
|
Merge pull request #13581 from basepi/releasecherrypick
Add some notes about cherry-picking
|
2014-06-20 06:33:48 -06:00 |
|
Joseph Hall
|
367c22bb3f
|
Merge pull request #13584 from garethgreenaway/tar_fix
Fix for tar files with "special" characters
|
2014-06-20 06:32:47 -06:00 |
|
Mathieu Le Marec - Pasquet
|
61ca1ef0df
|
cmd review
|
2014-06-20 13:54:35 +02:00 |
|
Pedro Algarvio
|
0da1e83a99
|
Merge pull request #13599 from s0undt3ch/hotfix/travis-setup-fix
Travis needs to know about the new requirements files
|
2014-06-20 12:35:28 +01:00 |
|
Pedro Algarvio
|
f963e6a246
|
apache-libcloud is no longer a hard dependency
|
2014-06-20 12:12:55 +01:00 |
|
Pedro Algarvio
|
a707a4e45a
|
Don't complain about extras_require under distutils
|
2014-06-20 12:10:34 +01:00 |
|
Pedro Algarvio
|
f83f4f2c42
|
Travis needs to know about the new requirements files
|
2014-06-20 12:09:22 +01:00 |
|
Mathieu Le Marec - Pasquet
|
5db68101d2
|
Review of cmd additions
|
2014-06-20 13:08:39 +02:00 |
|
Mathieu Le Marec - Pasquet
|
5cd80edefd
|
VT support for cmdmod
|
2014-06-20 13:08:39 +02:00 |
|
Pedro Algarvio
|
e23c4724e3
|
Merge pull request #13594 from s0undt3ch/hotfix/configurable-vt-log-levels
Configurable VT log levels
|
2014-06-20 11:56:24 +01:00 |
|
Pedro Algarvio
|
c9e5ffb71c
|
Remove left over prints
|
2014-06-20 11:55:20 +01:00 |
|
Pedro Algarvio
|
93ba688129
|
saltclients is now a MixIn and not a global variable. Fixes #13592.
Fixed hard coded path to the master configuration file.
|
2014-06-20 11:55:07 +01:00 |
|
Pedro Algarvio
|
349dedef80
|
Fix unicdode grains support. Fixes #13596.
Refs #12611
|
2014-06-20 11:46:01 +01:00 |
|
Pedro Algarvio
|
17cfca9564
|
Use the new function signature
|
2014-06-20 11:15:25 +01:00 |
|
Pedro Algarvio
|
7b3815e2dc
|
Configurable VT log levels
Also close terminal on `.terminate()`
|
2014-06-20 10:24:47 +01:00 |
|
Mathieu Le Marec - Pasquet
|
da758409d4
|
make color stripping configurable
|
2014-06-20 09:53:28 +02:00 |
|
Thomas S Hatch
|
33faa36be1
|
Clean up worker lanes
|
2014-06-20 00:35:56 -06:00 |
|
Thomas S Hatch
|
076d4bed66
|
Merge pull request #13590 from cvrebert/patch-3
netapi/__init__.py: fix docstring typos
|
2014-06-20 00:31:50 -06:00 |
|
Thomas S Hatch
|
a6fd8ab11a
|
Merge pull request #13589 from cvrebert/patch-2
netapi/rest_wsgi.py: fix typo in docstring
|
2014-06-20 00:31:23 -06:00 |
|
Thomas S Hatch
|
aac5bf1d7d
|
Merge pull request #13588 from cvrebert/patch-1
daemons/flo/worker.py: fix typos in docstring
|
2014-06-20 00:31:04 -06:00 |
|
Chris Rebert
|
38bbd1897c
|
netapi/__init__.py: fix docstring typos
|
2014-06-19 23:25:09 -07:00 |
|
Chris Rebert
|
ab4f8c7afb
|
netapi/rest_wsgi.py: fix typo in docstring
|
2014-06-19 23:23:04 -07:00 |
|
Chris Rebert
|
a022960b41
|
daemons/flo/worker.py: fix typos in docstring
|
2014-06-19 23:19:19 -07:00 |
|
Thomas S Hatch
|
aba45daed1
|
Clean up transport stacks
|
2014-06-20 00:17:32 -06:00 |
|
allan
|
f096375d25
|
nest nodegroup match
|
2014-06-20 14:17:24 +08:00 |
|
allan
|
fe5cd5894f
|
Revert "nest nodegroup match in nodegroups file"
This reverts commit 265c96d9cb.
|
2014-06-20 14:15:02 +08:00 |
|
Thomas S Hatch
|
3418b39643
|
clean up client stacks
|
2014-06-20 00:06:40 -06:00 |
|
Thomas S Hatch
|
0e6fdaa436
|
close and clean raet event sockets
|
2014-06-19 22:58:14 -06:00 |
|
allan
|
265c96d9cb
|
nest nodegroup match in nodegroups file
|
2014-06-20 12:32:15 +08:00 |
|
Thomas S Hatch
|
d52ad3a99a
|
Lint
|
2014-06-19 22:21:16 -06:00 |
|
Thomas S Hatch
|
06981edade
|
Merge pull request #13585 from cvrebert/patch-1
states.dockerio.running: fix bad indentation
|
2014-06-19 22:12:16 -06:00 |
|
Samuel M Smith
|
da8de18c6d
|
Support for presence manage added to master
Master will now auto rejoin with its minions after a master reboots in Raet
|
2014-06-19 21:11:28 -06:00 |
|
Gareth J. Greenaway
|
d924fc8dea
|
fixing a lint issue in dockerio.py unrelated to tar_fix but breaking lint tests.
|
2014-06-19 20:07:43 -07:00 |
|
Thomas Jackson
|
ebc4d89a5c
|
Consolidate TTL into a single function
|
2014-06-19 19:59:19 -07:00 |
|
Thomas Jackson
|
e645dfe76f
|
Add "keep_jobs" config to set the TTL of the objects in couchbase
|
2014-06-19 19:53:44 -07:00 |
|
Thomas Jackson
|
af41031360
|
Fix some more pylint errors
|
2014-06-19 19:39:47 -07:00 |
|
Thomas Jackson
|
5fb60c8348
|
Make pep8 happy
|
2014-06-19 19:39:47 -07:00 |
|
Thomas Jackson
|
86c3de86a8
|
Add attempts to import faster json libraries
|
2014-06-19 19:39:47 -07:00 |
|