Seth House
d8a172e310
Merge pull request #13629 from s0undt3ch/hotfix/lint
...
Lint Fixes
2014-06-21 11:52:17 -06:00
Seth House
bd794dd1e0
Merge remote-tracking branch 'upstream/pr/13624' into develop
2014-06-21 11:46:14 -06:00
Pedro Algarvio
94b1ab21ac
The stable version!
2014-06-21 16:08:50 +01:00
Pedro Algarvio
55cd462fa7
No need to iterate through keys
2014-06-21 15:34:33 +01:00
Pedro Algarvio
c952a4d61b
Remove unused import. White-space lint fix
2014-06-21 15:33:11 +01:00
Pedro Algarvio
d71128f98e
Update to latest bootstrap-script.sh, v2014.06.21
2014-06-21 14:46:08 +01:00
Pedro Algarvio
99dfb00805
Update 'doc/.tx/config' - Build #88
...
http://cookingwithsalt.org/job/salt/job/transifex/88/
Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
2014-06-21 13:36:03 +01:00
Joseph Hall
4dd77f8c5e
Merge pull request #13621 from nmadhok/fix-ddns
...
Changing return from ddns.absent and making minor fixes in the doc
2014-06-21 06:13:41 -06:00
Pedro Algarvio
a5ae66c267
ZeroMQ dependencies should be pulled by default
2014-06-21 10:12:10 +01:00
Pedro Algarvio
ce4052a3b0
Let's not forget the man pages. Refs #13554
2014-06-21 09:57:39 +01:00
Pedro Algarvio
bffb2b1524
Merge pull request #13619 from jacksontj/develop
...
Add some basic tests for some of the globals noted in #12292
2014-06-21 09:08:40 +01:00
Pedro Algarvio
79dfccfaeb
Merge pull request #13609 from rallytime/cloud_config_tests
...
Unit tests for is_provider_configured function in salt.config.py
2014-06-21 09:05:15 +01:00
Pedro Algarvio
dce8262232
Merge pull request #13623 from nmadhok/fix-lint
...
Fixing pylint errors
2014-06-21 09:04:20 +01:00
nmadhok
5dabfdb2dd
Fixing pylint error by removing hidden trailing spaces
2014-06-21 02:26:22 -04:00
nmadhok
63af29893a
Making the documentation more clear
2014-06-21 02:16:29 -04:00
nmadhok
8ae2b9e93a
Fixing pylint error
2014-06-21 02:00:24 -04:00
nmadhok
d395e1fddf
Fixing left pylint error
2014-06-21 01:45:04 -04:00
nmadhok
84e5faa7ab
Fixing pylint errors
2014-06-21 01:30:47 -04:00
nmadhok
f918e08c16
Fixing pylint errors
2014-06-21 01:22:31 -04:00
nmadhok
dbb3401bb7
Fixing ddns.absent docs and fixing the invalid output that ddns.absent returns
2014-06-21 00:47:28 -04:00
nmadhok
1881e17a8e
Fixing syntax to valid JSON and fixing keyring and keyname field
2014-06-21 00:41:49 -04:00
Seth House
a1b53b482b
Merge pull request #13620 from whiteinge/boolean-lint-breakage
...
Fixed a boolean check that was broken by overzealous lint fixing!
2014-06-20 20:08:13 -06:00
Seth House
eed98ab4b0
Fixed a boolean check that was broken by overzealous lint fixing!
2014-06-20 20:05:42 -06:00
Thomas Jackson
9d36f9f301
Add some basic tests for some of the globals noted in #12292
...
This is by no means complete (a lot of modules get __low__ or __env__ from their callers), but this will help catch some of the problems where we change the loader and the magic stops.
IMO we kinda need to overhaul the loader, and break out the module load, __virt__ running, packing of globals, and caching into seperate pieces
2014-06-20 19:00:10 -07:00
Seth House
804c5995c7
Switch LocalClient().cmd() to watch returns same as Salt's CLI
2014-06-20 19:50:26 -06:00
Seth House
16cfaad061
Quiet two pylint errors about missing __init__ method
2014-06-20 19:47:54 -06:00
Seth House
9ffb7de503
Merge pull request #13614 from jacksontj/saltnado
...
SaltAPI cleanup
2014-06-20 19:41:29 -06:00
Thomas Jackson
d654956c05
misc pylint fixes (missing imports etc)
...
Add utils function to import faster json libaries (if you have them) and switch couhcbase_return and saltnado to use them
2014-06-20 16:49:28 -07:00
Thomas Jackson
31f8c04506
Adding 2 missing imports
2014-06-20 16:44:20 -07:00
Thomas Jackson
baacda2286
Make sure to not leave hanging children processes if the parent is killed
2014-06-20 15:57:11 -07:00
Thomas Jackson
943476646a
pep8 cleanup
2014-06-20 15:16:13 -07:00
Thomas Jackson
c721d9d664
Seperate saltnado_websockets from the rest of the implementation.
2014-06-20 15:10:56 -07:00
Samuel Smith
01bc35a78e
Merge pull request #13612 from SmithSamuelM/sam_raet_46
...
Rejected keys now handled much better for Salt on RAET
2014-06-20 16:07:59 -06:00
Samuel M Smith
4df43dc01a
Merge remote-tracking branch 'upstream/develop' into sam_raet_46
2014-06-20 16:03:03 -06:00
Samuel M Smith
9b6a997e1e
Added minion abort if keys rejected on initial join
2014-06-20 16:02:13 -06:00
Erik Johnson
099187c9af
Merge pull request #13610 from whiteinge/clear_cache-versionaddded
...
Added versionadded for saltutil.clear_cache
2014-06-20 16:47:39 -05:00
rallytime
d9c9297954
Make cloud configuration unit tests more organized
2014-06-20 15:47:00 -06:00
Seth House
2bcb8f2c30
Added versionadded for saltutil.clear_cache
2014-06-20 15:34:00 -06:00
Mike Place
11e36f269f
Merge pull request #13608 from cachedout/revert_mworkers
...
Revert "Track MWorkers"
2014-06-20 15:31:35 -06:00
rallytime
1e83b2012b
Unit tests for is_provider_configured function in salt.config.py
2014-06-20 15:29:18 -06:00
Mike Place
e9c745e51d
Revert "Track MWorkers"
...
This reverts commit 9bbceefbae
2014-06-20 15:29:09 -06:00
Thomas S Hatch
3640b33fa2
minor copy edit per #13603
2014-06-20 13:10:28 -06:00
Thomas S Hatch
06f3226cb2
Merge pull request #13603 from basepi/eauthfailure
...
Rephrase the eauth failure error text
2014-06-20 13:09:41 -06:00
Thomas S Hatch
fc9b40d18e
first person per #13604
2014-06-20 13:09:05 -06:00
Thomas S Hatch
c42e77d214
Merge pull request #13604 from steverweber/pg_help
...
workaround for running database updates using psql_query
2014-06-20 13:07:38 -06:00
Thomas S Hatch
eccf8986ec
Lint per #13578
2014-06-20 13:06:43 -06:00
Thomas S Hatch
8d5fc6b1ec
Merge pull request #13578 from cachedout/masterapi
...
Audit of AESFuncs for masterapi
2014-06-20 13:06:12 -06:00
Thomas S Hatch
523d565f0f
Merge pull request #13576 from makinacorpus/cmd
...
VT support for cmdmod (review with care !)
2014-06-20 13:02:43 -06:00
Thomas S Hatch
bc056b7b63
Close #13606
2014-06-20 13:01:54 -06:00
Thomas S Hatch
f2124e1115
Merge pull request #13480 from makinacorpus/saltshare
...
[Review] carefully: salt.cloud.lxc & lxc revamp for unification
2014-06-20 13:00:06 -06:00
