Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ibsdeveloper/cloudstack
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: ibsdeveloper/cloudstack
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4.6
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 4 commits
  • 8 files changed
  • 3 contributors

Commits on Jan 28, 2016

  1. Add missing license header to ActionEventUtilsTest.

    jeff committed Jan 28, 2016
    Configuration menu
    Copy the full SHA
    5de8cb1 View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2016

  1. Merge pull request #1382 from greenqloud/pr-fix-license-header 

    Add missing license header to ActionEventUtilsTest.The test class was merged without the license header. This commit fixes that problem.

Also note that the license header exists on the master branch only as a result of commit 8a5fc16. The commit seems to be on the master branch and the 4.7 branch only. So there may be some conflicts when forward merging.

* pr/1382:
  Add missing license header to ActionEventUtilsTest.

Signed-off-by: Daan Hoogland <daan@onecht.net>
    @DaanHoogland
    DaanHoogland committed Jan 29, 2016
    Configuration menu
    Copy the full SHA
    7c446f0 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2016

  1. CLOUDSTACK-9369: Restrict default login to ldap/native users 

    - Restricts default login auth handler to ldap and native-cloudstack users
- Refactors and create re-usable method to find domain by id/path

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
    @rohityadavcloud
    rohityadavcloud committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    828cadb View commit details
    Browse the repository at this point in the history

  2. CLOUDSTACK-9376: Restrict listTemplates API with filter=all for root … 

    …admin

Restricts use of listemplates API with templatefilter=all for root admin only.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
    @rohityadavcloud
    rohityadavcloud committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    d9f5cc7 View commit details
    Browse the repository at this point in the history
Loading