Permalink
Commits on Apr 23, 2017
  1. Merge pull request #40836 from eradman/grain_virtual

    Set virtual grain for OpenBSD on KVM
    cachedout committed on GitHub Apr 23, 2017
  2. Merge pull request #40778 from rallytime/oxygen-deprecations

    Start removing deprecated code for Oxygen release
    cachedout committed on GitHub Apr 23, 2017
  3. Merge pull request #40782 from wolfpackmars2/patch-6

    Add kernelversion grain
    cachedout committed on GitHub Apr 23, 2017
  4. Merge pull request #40825 from sjorge/mdata-grains

    Move mdata grains from core.py to mdata.py
    cachedout committed on GitHub Apr 23, 2017
  5. Merge pull request #40839 from cst05001/develop

    try to fix a modules.file.line bug
    cachedout committed on GitHub Apr 23, 2017
  6. Merge pull request #39850 from epcim/pr_fix_keystone_endpoints_multir…

    …egion
    
    Fix endpoint handling per region
    cachedout committed on GitHub Apr 23, 2017
  7. re.search in function _regex_to_static() should support re.MULTILINE …

    …or cause bug
    
    	modified:   file.py
    方云麟 committed Apr 23, 2017
  8. Set virtual grain for OpenBSD on KVM

    None of the file system tests for /sys or /proc can succeed on OpenBSD;
    create a new branch for determining the 'virtual' grain
    eradman committed Apr 23, 2017
Commits on Apr 22, 2017
  1. Merge pull request #40829 from Ch3LL/disk_nebula

    Add option to expand disk size in nebula
    cro committed on GitHub Apr 22, 2017
Commits on Apr 21, 2017
  1. fix where clone check happens

    Ch3LL committed Apr 21, 2017
  2. add spaces for code in docs

    Ch3LL committed Apr 21, 2017
  3. add title

    Ch3LL committed Apr 21, 2017
  4. Merge pull request #40823 from rallytime/merge-develop

    [develop] Merge forward from nitrogen to develop
    rallytime committed on GitHub Apr 21, 2017
  5. Merge pull request #40786 from bodhi-space/infra4728

    INFRA-4728 - boto3_sns execution and state modules
    cachedout committed on GitHub Apr 21, 2017
  6. Merge pull request #40809 from gtmanfred/develop

    Add zookeeper managing module and state
    cachedout committed on GitHub Apr 21, 2017
  7. Merge pull request #40814 from chqian/dev/chqian/fix_opkg_list_pkgs_w…

    …ith_description
    
    Make pkg.list_pkgs() parse output with description
    cachedout committed on GitHub Apr 21, 2017
  8. Properly parse SDC grains defined in spec

    sjorge committed Apr 21, 2017
  9. Merge branch 'nitrogen' into 'develop'

    No conflicts.
    rallytime committed Apr 21, 2017
  10. Merge pull request #40783 from xetus-oss/feature-40755

    Add state.orch_show_sls to the state runner
    rallytime committed on GitHub Apr 21, 2017
  11. Merge pull request #40810 from rallytime/fix-tls-test-failure

    Skip tsl unit test when we hit an error due to OpenSSL and junos-eznc packaging conflict.
    rallytime committed on GitHub Apr 21, 2017
  12. Optimize BrandZ detection and remove mdata grains

    We can use os.uname() to detect if we are running in a LX zone on
    SmartOS. This saves us one fork/exec.
    
    The mdata stuff has also been removed from the core grain module.
    A seperate grain module will be take it's place. This to improve
    the core grains readability and to nicely seperate out the
    functionality.
    sjorge committed Apr 21, 2017
  13. Endpoint handling per region, fixes #35874

    - extend tests for multiple regions
    - region arg by default set to None
    - print verbose changes to be exec.
    epcim committed Mar 6, 2017
  14. Merge pull request #40753 from arno01/dockerng-enhanced

    dockerng: avoid network duplication and add driver_opts
    cachedout committed on GitHub Apr 21, 2017
  15. dockerng: avoid network duplication and add driver_opts

    arno01 committed Apr 18, 2017
Commits on Apr 20, 2017
  1. add zookeeper module and state

    Also use __context__ in zk_conncurrency
    gtmanfred committed Apr 17, 2017
  2. Merge pull request #40807 from rallytime/merge-nitrogen

    [nitrogen] Merge forward from 2016.11 to nitrogen
    rallytime committed on GitHub Apr 20, 2017
  3. Merge pull request #40806 from rallytime/merge-develop

    [develop] Merge forward from nitrogen to develop
    rallytime committed on GitHub Apr 20, 2017
  4. Skip tsl unit test when we hit an error due to OpenSSL and junos-eznc…

    … packaging conflict
    
    he pip junos-eznc package, when installed with PyOpenSSL version 0.14 causes
    this test failure. If you either remove junos-eznc, or upgrade PyOpenSSL
    (current is 0.17) the test is happy. So, we need to handle this case in the test.
    rallytime committed Apr 20, 2017
  5. Merge branch '2016.11' into 'nitrogen'

    Conflicts:
      - salt/utils/s3.py
    rallytime committed Apr 20, 2017
  6. Merge branch 'nitrogen' into 'develop'

    No conflicts.
    rallytime committed Apr 20, 2017
  7. Merge pull request #40797 from rallytime/merge-2016.11

    [2016.11] Merge forward from 2016.3 to 2016.11
    rallytime committed on GitHub Apr 20, 2017
  8. Merge pull request #40800 from rallytime/bp-40720

    Back-port #40720 to 2016.11
    rallytime committed on GitHub Apr 20, 2017
  9. Merge pull request #40802 from rallytime/fix-pkgrepo-test-failure

    Update managed.sls test file: osmajorrelease grain is an int now
    rallytime committed on GitHub Apr 20, 2017