Commit Graph

8936 Commits

Author SHA1 Message Date
Jeff Schroeder
4da4dc25a1 Skip the virtualenv state test if virtualenv isn't installed 2012-12-21 21:35:58 -06:00
Thomas S Hatch
54ac2e23f6 Merge pull request #2990 from tchap/doc/emerge_salt
Make sure the Portage package name is unambiguous
2012-12-21 11:02:39 -08:00
Ondrej Kupka
f49506f38e Make sure the Portage package name is unambiguous 2012-12-21 19:20:41 +01:00
David Boucha
8d5fbce01b Merge pull request #2989 from tchap/doc/emerge_salt
Update Gentoo installation manual
2012-12-21 10:20:29 -08:00
Ondrej Kupka
bfe70f7405 Update Gentoo installation manual 2012-12-21 19:05:33 +01:00
Thomas S Hatch
b0a5477e49 Merge pull request #2988 from sharan-monikantan/develop
SysBench module for testing salt minions
2012-12-21 09:30:27 -08:00
Sharan Kumar Monikanta Rajan
069d6ecf19 SysBench module for testing salt minions
SysBench is a benchmark tool for measuring the system parameters. This module helps in analyzing the minions right from the master. This helps in scenarios like load balancing
2012-12-21 09:08:24 -08:00
Thomas S Hatch
8df22ce3bf Merge pull request #2985 from akoumjian/develop
Add bootstrap and prioritize platform instructions to install
2012-12-21 08:31:35 -08:00
Alec Koumjian
26ac0437fe Add bootstrap and prioritize platform instructions to install 2012-12-20 21:21:59 -08:00
Thomas S Hatch
3d0dfbebf9 Merge pull request #2983 from cedwards/freebsd
Added test to support alternate SERVICE_DIR location
2012-12-20 19:45:18 -08:00
Christer Edwards
b352bca972 Added test to support alternate SERVICE_DIR location 2012-12-20 20:42:32 -07:00
Thomas S Hatch
5968eaf6d8 Merge pull request #2982 from UtahDave/develop
Add Alpha version of Windows Package Manager!!
2012-12-20 17:10:41 -08:00
David Boucha
1e9bdb1370 Squashed commit of the following:
commit 56829e8239ee88f2672d1f749ef3b3765d190604
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 18:06:04 2012 -0700

    remove debug prints

commit ab326554b1d8851fed064231d4b9d090c9d0f6ed
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 17:46:02 2012 -0700

    quotes around windows installer with spaces in name

commit 49fb4043f353f4d28c9e6ad1b4e005922c7722d4
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 17:41:11 2012 -0700

    iiiiiii

commit 0245dc47c56de7e43a5d85e850a296309e580963
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 17:27:31 2012 -0700

    lkj

commit 26645963de84149c51ac5cbaef91148e94585da0
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 17:25:16 2012 -0700

    try again

commit ab9a5cd249c7e1558a3c87b6b4ba3933ddd043ca
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 17:21:41 2012 -0700

    lkjljlkjl  PLEASE work!!!

commit c024bc956dbb05a0617454d17b8b3df8d34f949a
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 17:15:40 2012 -0700

    lkjlkj

commit 3eb610e1fef7a1efed021bc71ba48a89ec2af23b
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 17:08:21 2012 -0700

    stuff

commit 59f9dd76f60799db4b68d8ccd10854a2ad01f930
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 17:02:34 2012 -0700

    another fix

commit 1dfe105829cbddcf37d0e029b6f8351c72a58269
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 16:59:35 2012 -0700

    moar bug fixes

commit acbaf246b1ddcd8a309fe0d6416ce61a0fe34f8b
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 16:48:58 2012 -0700

    fix moar bugs

commit 5731af3eb9b2446d6a1466918fceaa08b3331b9e
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 16:44:46 2012 -0700

    fix it

commit 532abe6b4c8691b0c67078ac76490cd83e602c9b
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 16:40:04 2012 -0700

    First try at installing windows software

commit edc05e3239c94d3b143ab63df661995782352766
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 15:45:56 2012 -0700

    try to avoid keyerrors

commit 216734db63de5e964e2c79b3eae2a203780e1eaf
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 09:48:02 2012 -0700

    fix  typo

commit dc20f405e13e06dd0f6322f1c1275e2d2bf4ba57
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 09:45:27 2012 -0700

    fix available version

commit 41669aca4f5d1f6ca4d0b089ba5753a3554a0c3e
Author: David Boucha <boucha@gmail.com>
Date:   Thu Dec 20 09:32:17 2012 -0700

    Start filling out availabe version()

commit 3898f00202a427bb70c7e33dfd8b6eee1e9bbecd
Author: David Boucha <boucha@gmail.com>
Date:   Wed Dec 19 15:49:23 2012 -0700

    change cache file extension, update refresh_db()

commit 600696ea3e0638331f1d71fb294f982652d73799
Author: David Boucha <boucha@gmail.com>
Date:   Wed Dec 19 14:16:10 2012 -0700

    add default win repo location

commit f9fdb11efd434e4d9df2ab5b62daf6042d770230
Author: David Boucha <boucha@gmail.com>
Date:   Wed Dec 19 14:12:15 2012 -0700

    rename location of win cache file on master

commit a260eaddacbb22c4b3ae391f18cf19ef299de3d8
Author: David Boucha <boucha@gmail.com>
Date:   Wed Dec 19 13:40:27 2012 -0700

    Unify the name of the windows repo cache file
2012-12-20 18:07:56 -07:00
Thomas S Hatch
27c0d1195e Fix more whitelist errors 2012-12-20 17:56:35 -07:00
Thomas S Hatch
59f1c6bc50 fix loader whitelist typo in eauth 2012-12-20 16:57:35 -07:00
Thomas S Hatch
cec7b43139 Make masterminion class accept whitelist 2012-12-20 16:51:52 -07:00
Thomas S Hatch
7928f2261c Trim the master minion modules 2012-12-20 16:47:55 -07:00
Thomas S Hatch
56955c7d8b Add whitelist hooks to loader functions 2012-12-20 16:18:57 -07:00
Thomas S Hatch
d217fd9f49 update contents to have the git policy 2012-12-20 16:08:10 -07:00
Thomas S Hatch
f687d1fa17 Merge pull request #2980 from jhutchins/develop
Develop
2012-12-20 14:53:51 -08:00
Pedro Algarvio
8976bbe5ac Merge branch 'develop' of github.com:saltstack/salt into develop 2012-12-20 22:52:16 +00:00
Jeff Hutchins
4050753609 Revert "Improve modules check"
This reverts commit 6a9f9fb51d.
2012-12-20 15:51:46 -07:00
Pedro Algarvio
f0510e656d Fewer comments. Left the most important one in the proper place. Refs #2958. 2012-12-20 22:50:43 +00:00
Thomas S Hatch
1e3b6f1262 Merge pull request #2979 from s0undt3ch/develop
Set linger on ZMQ sockets before closing
2012-12-20 14:45:40 -08:00
Thomas S Hatch
5ca5a24442 Add whitelist capability to the loader, fix#2903 2012-12-20 15:45:28 -07:00
Jeff Hutchins
6a9f9fb51d Improve modules check
There are actually two improvements here.
1) this.ko.bak and that.konan won't match anymore
2) Both lines become constant time opperations rather than having to seek from
   beggining to end of each string looking for the extension.
2012-12-20 15:42:16 -07:00
Pedro Algarvio
40619a5b49 Set linger on ZMQ sockets before closing, stops issues with context.term() hanging indefinitely. Refs #2958.
* Any unsent messages a socket which does not have `linger` set to a positive value, will make `context.term()` hang indefinitely. See https://github.com/zeromq/pyzmq/issues/102 for more info.
2012-12-20 22:37:21 +00:00
Jeff Hutchins
107c265664 List modules that aren't in the kernel folder. 2012-12-20 15:23:39 -07:00
Thomas S Hatch
d19bf88a53 Add style guide to the toc 2012-12-20 14:17:39 -07:00
Joseph Hall
4c3e6d4a8d Merge pull request #2977 from cedwards/freebsd
fixed typo s/locatime/localtime/
2012-12-20 12:42:17 -08:00
Christer Edwards
ef9f3b603a fixed typo s/locatime/localtime/ 2012-12-20 13:38:18 -07:00
Thomas S Hatch
4043b976e9 Merge pull request #2976 from herlo/develop
fixing typos is fun!
2012-12-20 12:23:39 -08:00
Clint Savage
3cd8c56875 fixing typos is fun! 2012-12-20 13:22:17 -07:00
Thomas S Hatch
892a371b87 Fix #1775 by adding a coding style 2012-12-20 12:35:27 -07:00
Thomas S Hatch
beab5c5862 Merge pull request #2973 from seanchannel/develop
both ways to add repo
2012-12-20 11:31:19 -08:00
Sean Channel
8adee9532a both ways to add repo 2012-12-20 11:20:48 -08:00
Thomas S Hatch
e018689c38 Merge pull request #2971 from jhutchins/develop
Fix mounting issue introduced by e01c3d52b1
2012-12-20 10:42:30 -08:00
Jeff Hutchins
16bc496b11 Fix mounting issue introduced by e01c3d52b1 2012-12-20 11:36:44 -07:00
Thomas S Hatch
fdac2216fc Add some docs to service module, fix #1508 2012-12-20 11:16:38 -07:00
Thomas S Hatch
9d1015b836 Merge pull request #2941 from Talksum/rh_ip-jinjaloader
change from jinja's PackageLoader to FileSystemLoader
2012-12-20 09:56:58 -08:00
Joseph Hall
bb2ad117d3 Merge pull request #2970 from herlo/develop
updated to 0.11.1 for security vulnerability fix
2012-12-20 09:26:23 -08:00
Clint Savage
45b2eb1cc8 updated to 0.11.1 for security vulnerability fix 2012-12-20 10:24:41 -07:00
Thomas S Hatch
25aaabdd39 Merge pull request #2969 from nkuttler/doc_debian
Update the incorrect Debian install information
2012-12-20 08:34:30 -08:00
Thomas S Hatch
169c5314c4 Merge pull request #2968 from nkuttler/doc_fixes
Fix three small typos
2012-12-20 08:33:59 -08:00
Thomas S Hatch
51c39960fa Add version number of the minion to the auth error message 2012-12-20 09:25:12 -07:00
Nicolas Kuttler
947d40adf2 Update the incorrect Debian install information 2012-12-20 17:15:05 +01:00
Thomas S Hatch
d00cc81b57 Merge pull request #2962 from rizumu/0.11.0
Match Arch's PKGBUILD files with those in the AUR (0.11.0 branch)
2012-12-20 08:12:05 -08:00
Thomas S Hatch
7e684e92dd Merge pull request #2961 from rizumu/develop
Match Arch's PKGBUILD files with those in the AUR (develop branch)
2012-12-20 08:11:39 -08:00
Nicolas Kuttler
657878dcdc Add missing colons 2012-12-20 16:51:30 +01:00
Nicolas Kuttler
d422217aab Fix typo 2012-12-20 16:51:04 +01:00