Merge branch 'sam_cloud' into sam_20131202
Merge remote-tracking branch 'upstream/develop' into sam_20131202
Merge remote-tracking branch 'upstream/develop' into sam_20131202
Merge remote-tracking branch 'upstream/develop' into sam_20131202
Merge remote-tracking branch 'upstream/develop' into sam_20131202
Allow editable=. for pip.install
Add unit test for event timeouts
rm unused import from zcbuildout state

salt/states/zcbuildout.py:41: [W0611(unused-import), ] Unused import re
Catch os.error instead of all Exceptions
Added exception handler for git repo init
Support Oracle Linux 5.x

Oracle Linux 5, also known as Unbreakable Linux is currently
not supported by salt.

This one line fix solves this issue.

For reference, the os info extracted through platform.linux_distribution()
python call:
('Enterprise Linux Enterprise Linux Server', '5.1', 'Carthage')
Fixes issue #8951 - gem install fails when rvm is set up with another user
switches paths to state files to use forwardslashes on masterless windows
Merge remote-tracking branch 'upstream/develop' into sam_20131202
Added debug
Grains detection for LXC and fix error in disk.usage under Docker

I have modified the core grains detection routines where dragons often lay, so this should be reviewed carefully.

I have elected to set the LXC detection inside virtual_subtype for account for cases wherein a user might be running inside VirtualBox (as the tutorial for Docker leads one to do). Moreover, I also allow the virtualization detection to continue after LXC is detected, as I believe it may even be possibly for Xen and LXC to co-exist. (Though, let's be honest -- probably not recommended!)

Finally, disk.usage now correctly fails with a warning message and includes a work-around for gathering disk usage under Docker containers. This refs #8976.
Keep pid of salt CLI command from showing in status.pid output

When status.pid is executed by the salt-minion instance running on the
master, it also returns the pid of the salt CLI command, because the
search string matches. This commit adds another grep to the ps/grep/awk
one-liner, which filters out lines matching 'status.pid'.
Integration testing for #8976
Merge branch 'develop' into #8976

* develop:
  Integration testing for #8976
Don't run the #8976 tests on Windows.