tsclausing
1fa275fcf5
#2683 - Syntax to include states from explicit env, or resolve with _xenv.
2012-11-27 00:53:30 -06:00
tsclausing
4b6dc3b56c
Merge branch 'develop' into xenv-include
2012-11-26 22:58:07 -06:00
tsclausing
84ce8160cf
Merge remote-tracking branch 'saltstack/develop' into develop
2012-11-26 22:41:53 -06:00
Sean Channel
45b41e856a
Merge pull request #2710 from seanchannel/develop
...
use files from pkg/
per comments in commit 09f2239
2012-11-26 16:04:31 -08:00
Sean Channel
4080eeada4
use files from pkg/
2012-11-26 15:59:42 -08:00
Thomas S Hatch
33a18367c0
Make the batch class more apiable
2012-11-26 11:32:28 -07:00
Thomas S Hatch
c65708031b
Add recon_max to the minion config
2012-11-26 11:05:35 -07:00
Thomas S Hatch
07de7ff6f5
Add zeromq reconnect max value to fix #2654
2012-11-26 10:49:51 -07:00
Thomas S Hatch
be8ecf2cd4
Merge pull request #2706 from fatbox/rpm-faster-version
...
Speed up yum/rpm version() if we're not looking for something specific
2012-11-26 09:29:31 -08:00
Evan Borgstrom
747ee941f6
Speed up yum/rpm version() if we're not looking for something specific
...
While testing things I end up applying state a lot, and when yum is
invoked for every single `pkg.installed` state it ends up taking a
really long time.
Since the comments for list_pkgs say it's being used to handle version
matching I think it's a reasonable assumption to make that if the
package name provided to `version` does not contain a number then the user
doesn't have any complex version matching requirements.
This makes my state run times go from:
real 1m16.450s
user 0m3.016s
sys 0m0.657s
To:
real 0m4.689s
user 0m1.780s
sys 0m0.333s
Let me know if you have any conerns about this.
2012-11-26 01:49:09 -05:00
Thomas S Hatch
1dd104c706
Merge pull request #2704 from s0undt3ch/develop
...
Minor improvements to the tests daemon.
2012-11-25 22:09:50 -08:00
Pedro Algarvio
bd552ef4a8
Migrate some of the Vagrant branch improved minions wait and sync code.
2012-11-26 05:44:18 +00:00
Thomas S Hatch
f8543d061b
Merge pull request #2703 from archtaku/develop
...
Make win_pkg.py act like other pkg providers
2012-11-25 20:36:16 -08:00
Pedro Algarvio
8227e6374e
Merge branch 'develop' of github.com:saltstack/salt into develop
2012-11-26 04:33:04 +00:00
Pedro Algarvio
74aeeab5e5
Add some color when a test minion connects(trigger a Travis build).
2012-11-26 04:32:25 +00:00
Erik Johnson
501ec6b191
Make win_pkg.py act like other pkg providers
...
Where applicable, rather than returning a string noting that a function
is not implemented, instead return an empty version of the expected
return data type, and log a message at loglevel "warning" to note that
the function has not been implemented.
2012-11-25 22:30:25 -06:00
Thomas S Hatch
6f5f67653d
Merge pull request #2701 from s0undt3ch/develop
...
Fix `UnboundLocalError` on `salt.modules.file.patch()`
2012-11-25 20:05:46 -08:00
Thomas S Hatch
23ea376e04
Merge pull request #2702 from tsclausing/minion-auth
...
#2691 - Minions do not reconnect if not authed
2012-11-25 20:05:08 -08:00
Pedro Algarvio
e4f28d1db8
Fix UnboundLocalError on salt.modules.file.patch()
2012-11-26 04:02:22 +00:00
Thomas S Hatch
675397e5bf
Merge pull request #2700 from s0undt3ch/hotfix/distutils-warnings
...
Handle non supported distutils options.
2012-11-25 19:56:16 -08:00
Thomas S Hatch
5869fbfb81
Merge pull request #2699 from techhat/baremetal
...
Adding support for managing keyboards
2012-11-25 19:53:47 -08:00
Thomas S Hatch
7428875e91
Merge pull request #2696 from archtaku/develop
...
Add multiple package source support to solarispkg.py
2012-11-25 19:51:19 -08:00
tsclausing
b7c900df75
Merge remote-tracking branch 'saltstack/develop' into minion-auth
2012-11-25 21:47:13 -06:00
tsclausing
7b2592dc9e
Merge remote-tracking branch 'saltstack/develop' into xenv-include
2012-11-25 21:46:50 -06:00
tsclausing
d1b0c276cf
Merge remote-tracking branch 'saltstack/develop' into develop
2012-11-25 21:44:05 -06:00
Thomas S Hatch
0cc12b318d
Merge pull request #2695 from BackSeat/develop
...
Rework Linux and FreeBSD insatllation pages
2012-11-25 19:41:51 -08:00
Pedro Algarvio
abd54d0cba
Merge branch 'develop' of github.com:saltstack/salt into hotfix/distutils-warnings
2012-11-26 03:37:55 +00:00
Thomas S Hatch
b71a61b9e9
Merge pull request #2694 from s0undt3ch/develop
...
`fcntl` is not available on windows.
2012-11-25 19:35:20 -08:00
Thomas S Hatch
6230ce32f8
Merge pull request #2693 from giantlock/develop
...
dry mode activated by different key in *BSD
2012-11-25 19:34:09 -08:00
Thomas S Hatch
508f1fd640
Merge pull request #2692 from s0undt3ch/issues/2688
...
Switch `source` for `.`(dot) for sourcing. Fixes #2688 .
2012-11-25 19:32:39 -08:00
Pedro Algarvio
e70d70aa75
Minor PEP-8. Remove non supported distutils options from setup_kwargs if not using setuptools.
2012-11-26 03:06:25 +00:00
Joseph Hall
9f7374ae6e
Adding support for managing keyboards
2012-11-25 19:07:23 -07:00
Joseph Hall
d5e12b0967
Merge pull request #2698 from techhat/baremetal
...
Rename grub.py to grub_legacy.py
2012-11-25 18:06:47 -08:00
Pedro Algarvio
65d5e6dcc9
Include DEPRECATED in the deprecated output options.
2012-11-26 00:37:57 +00:00
Pedro Algarvio
fd283e9689
Improved SaltReturnAssertsMixIn.
...
* Added `assertReturnSaltType` which is dictionary for non errors.
* Added `assertReturnNonEmptySaltType` which does the above and makes sure it's not empty.
* Fix `tests.integration.states.user.UserTest` which was using wrongly using `assertSaltTrueReturn` on 'user.info' calls.
2012-11-25 22:29:08 +00:00
Pedro Algarvio
9e8d27e81b
Do assertSaltTrueReturn on each of the salt calls.
2012-11-25 22:28:30 +00:00
tsclausing
f5c7d9f585
Merge branch 'xenv-include' into develop
2012-11-25 16:01:47 -06:00
tsclausing
e1f0e5a863
Merge branch 'minion-auth' into develop
2012-11-25 16:01:15 -06:00
tsclausing
68f7ae87a2
Merge remote-tracking branch 'saltstack/develop' into develop
2012-11-25 15:32:28 -06:00
Pedro Algarvio
ee8a4faccc
Make sure that parts are also dictionaries.
2012-11-25 20:11:24 +00:00
tsclausing
057b658bdc
#2691 - Minion must wait for master to accept key.
2012-11-25 12:25:49 -06:00
tsclausing
993af66919
#2683 - State sls may include sls from any environment which the minion has access via top.
2012-11-25 12:20:46 -06:00
Erik Johnson
65b97de869
Add logging to cp.cache_file
...
Log to loglevel "error" when cp.cache_file fails to cache a file.
2012-11-25 11:28:26 -06:00
Erik Johnson
e74aa90da1
Merge branch 'solarispkg' into develop
...
Conflicts:
salt/modules/pkg_resource.py
2012-11-25 11:17:09 -06:00
Erik Johnson
f2cbb1873f
Add logging of stderr output on install command
2012-11-25 11:14:54 -06:00
Keith Edmunds
a4869208e9
Rework Linux and FreeBSD insatllation pages
2012-11-25 16:23:01 +00:00
Pedro Algarvio
b59464792a
fcntl is not available on windows.
2012-11-25 15:23:04 +00:00
Denis Generalov
cf2da2fa39
dry mode activated by different key in *BSD
2012-11-25 17:52:07 +04:00
Pedro Algarvio
ecfbbb3359
Switch source for .(dot) for sourcing. Fixes #2688 .
...
* The `.`(dot) seems to be the most supported way to source files on the various "major" linux shells.
2012-11-25 11:41:20 +00:00
Romeo Theriault
0974d8a4f6
working on solaris again
2012-11-24 22:45:03 -10:00
