etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
30,776 Commits 325 Branches 325 Tags 885 MiB
Commit Graph

30776 Commits

Author SHA1 Message Date
Nitin Kumar Maharana b2b422c7d7 CLOUDSTACK-8672 : NCC Integration with CloudStack. 2017-07-20 12:42:43 +05:30
Priyank Parihar b2f7f9abb6 CLOUDSTACK-8672 : NCC Integration with CloudStack. 2017-07-20 12:42:43 +05:30
Rajesh Battala 884606f77b CLOUDSTACK-8672 : NCC Integration with CloudStack. 2017-07-20 12:42:43 +05:30
Rohit Yadav 445dbe7c53 Merge remote-tracking branch 'origin/4.10' 2017-07-14 15:00:11 +05:30
Rohit Yadav 32e96abea9 Merge remote-tracking branch 'origin/4.9' into 4.10 2017-07-14 14:59:17 +05:30
Wido den Hollander ca415e7436 CLOUDSTACK-9929: Do not gather statistics for CDROM or FLOPPY devices 
Libvirt / Qemu (KVM) does not collect statistics about these either.

On some systems it might even yield a 'internal error' from libvirt
when attempting to gather block statistics from such devices.

For example Ubuntu 16.04 (Xenial) has a issue with this.

Skip them when looping through all devices.

Signed-off-by: Wido den Hollander <wido@widodh.nl>
 2017-07-14 14:57:11 +05:30
Rohit Yadav 322e18a7b6 CLOUDSTACK-9928: Allow native CloudStack users to change password in UI 
This allows native CloudStack users to change password in UI when LDAP
is enabled. Overall changes:
- A new usersource returned in the listUsers response
- Removed ldap check in the UI, replaced with check based on user source
- DB changes to include user.source in user_view
- Changed UI error message for non-native users trying to change password

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2017-07-14 14:55:08 +05:30
dahn 3a70c5cd16 schema: 4.10 to 4.11 upgrade path (#2175) 
Add 4.10 to 4.11 upgrade path

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2017-07-13 15:45:26 +05:30
Rohit Yadav 8bb5585f0d Merge remote-tracking branch 'origin/4.10' 2017-07-12 20:45:24 +05:30
Rohit Yadav c663a76dc7 Merge pull request #2176 from shapeblue/4.10-travis-jdk8fix 
Travis: use oraclejdk8 for 4.10+
 2017-07-12 20:44:41 +05:30
Rohit Yadav 9f9fdd46e3 Travis: use oraclejdk8 for 4.10+ 
Issue: https://github.com/travis-ci/travis-ci/issues/8075

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2017-07-12 19:53:03 +05:30
Rohit Yadav 771576f117 Merge branch '4.10' 2017-07-12 13:11:14 +05:30
Rohit Yadav 3589846a72 Merge branch '4.9' into 4.10 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2017-07-12 13:09:04 +05:30
Rohit Yadav a97d2505c8 Merge PR #2172 on origin/4.9 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2017-07-12 13:07:50 +05:30
Rajani Karuturi 4bc7c270fa Updating pom.xml version numbers for release 4.11.0.0-SNAPSHOT 
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
 2017-07-12 12:09:38 +05:30
Rohit Yadav 4b4c363ea9 Travis: Fix usage of sudo enable Trusty images 
Adds group to travis yml file based on:
https://blog.travis-ci.com/2017-06-19-trusty-updates-2017-Q2

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2017-07-11 16:02:51 +05:30
Rajani Karuturi 4f229d19ad Updating pom.xml version numbers for release 4.10.1.0-SNAPSHOT 
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
 2017-07-10 10:36:24 +05:30
Rajani Karuturi 81453c64d6 Merge release branch 4.10 to master 
* 4.10:
  Updating pom.xml version numbers for release 4.10.0.0
 2017-07-10 10:33:49 +05:30
Rajani Karuturi 9d2893d44a Updating pom.xml version numbers for release 4.10.0.0 
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
 2017-07-03 10:06:43 +05:30
Rajani Karuturi 3bef90174b Merge pull request #2162 from nuagenetworks/vrouter_preformance_fix 
CLOUDSTACK-9980: Fix for DNS after network restart with clean up.
 2017-07-03 10:04:35 +05:30
Sigert Goeminne 77da97aad9 CLOUDSTACK-9980: Fix for DNS after network restart with clean up. 
Configure.py without arguments gives IndexError.
 2017-06-28 12:21:14 +02:00
Rajani Karuturi d577adeaa8 Merge release branch 4.9 to master 
* 4.9:
  Revert "Merge pull request #2084 from shapeblue/passwd-speedup"
 2017-06-26 09:59:13 +05:30
Rajani Karuturi 24434beb42 Revert "Merge pull request #2084 from shapeblue/passwd-speedup" 
This reverts commit 48f413a982, reversing
changes made to 5f35c15b6b.
 2017-06-26 09:58:33 +05:30
Rajani Karuturi b9a4cb8770 Merge release branch 4.9 to master 
* 4.9:
  vRouter defer configure: Resolve merge conflicts
  vRouter: vr_cfg: style consistency fixes
  vRouter: vr_cfg: Keep the original cfg
  vRouter: prevent fh leakage and use buffered writes in DataBags
 2017-06-20 10:14:50 +05:30
Rajani Karuturi a25b54cf05 Merge pull request #2150 from karuturi/PR-2147-master 
Two fixes for RC3 by @mike-tutkowski
 2017-06-20 10:11:53 +05:30
Rajani Karuturi dab9795bf4 Merge pull request #2089 from The-Loeki/vrouter-defer-configure 
vRouters fixes & performance improvement
 2017-06-18 14:47:10 +05:30
Mike Tutkowski 330089a801
Only add the “.vmdk” suffix if need be 
(cherry picked from commit b156d5de11)

Signed-off-by: Rajani Karuturi <rajani.karuturi@accelerite.com>
 2017-06-15 16:29:05 +05:30
Mike Tutkowski ccb68e13a7
Fix for an issue introduced in this commit: 336df84f17 
(cherry picked from commit c57f556966)

Signed-off-by: Rajani Karuturi <rajani.karuturi@accelerite.com>
 2017-06-15 16:28:52 +05:30
Ronald van Zantvoort 330a0c7f2b vRouter defer configure: Resolve merge conflicts 2017-06-07 18:20:02 +02:00
Ronald van Zantvoort a2eb0f23a9 vRouter: vr_cfg: style consistency fixes 2017-06-07 18:11:33 +02:00
Ronald van Zantvoort 8f5275399e vRouter: vr_cfg: Keep the original cfg 2017-06-07 18:11:33 +02:00
Ronald van Zantvoort c10c3245d1 vRouter: prevent fh leakage and use buffered writes in DataBags 2017-06-07 18:11:33 +02:00
Rohit Yadav ed376fcad6 Merge remote-tracking branch 'origin/4.9' 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2017-06-07 11:21:27 +05:30
Rajani Karuturi ccd623fdf5 Merge pull request #2100 from Accelerite/CLOUDSTACK-9907 
CLOUDSTACK-9907 Physical size of snapshot is considered for usage
 2017-06-07 11:08:03 +05:30
Rajani Karuturi 52232b92a0 Merge pull request #2135 from shapeblue/force-stop-vm-kvm 
[BLOCKER] CLOUDSTACK-9860: Fix stackoverflow issue
 2017-06-07 11:04:32 +05:30
Rajani Karuturi be6e1a8596 Merge pull request #1759 from yvsubhash/CLOUDSTACK-9589 
CLOUDSTACK-9589 vmName entries from host_details table for the VM's w…
 2017-06-07 11:03:49 +05:30
Rajani Karuturi b8c113f4b9 Merge pull request #1726 from yvsubhash/CLOUDSTACK-9560 
CLOUDSTACK-9560 Root volume of deleted VM left unremoved
 2017-06-06 17:11:06 +05:30
Rajani Karuturi ef7dabe635 Merge pull request #1866 from Accelerite/egresdcidr 
Advanced isolated network egress destination cidr support added
 2017-06-06 17:10:14 +05:30
Rajani Karuturi 9fd0965087 Merge pull request #2126 from Accelerite/CLOUDSTACK-9740 
CLOUDSTACK-9740 : Search for secondary IP of NIC that is attached to an instance is not working
 2017-06-06 16:29:45 +05:30
subhash yedugundla 49a661be5f CLOUDSTACK-9589 vmName entries from host_details table for the VM's whose state is Expunging should be deleted during upgrade from older versions 2017-06-06 16:27:54 +05:30
Rajani Karuturi b894cc4cf1 Merge pull request #2132 from Accelerite/CLOUDSTACK-9935 
CLOUDSTACK-9935 : Search in VPN Customer Gateway not working
 2017-06-06 16:23:36 +05:30
Rajani Karuturi f4eff539c4 Merge pull request #1716 from yvsubhash/CLOUDSTACK-9555 
CLOUDSTACK-9555 when a template is deleted and then copied over again…
 2017-06-06 16:17:52 +05:30
Rajani Karuturi 18af707aeb Merge pull request #1725 from yvsubhash/CLOUDSTACK-9559 
CLOUDSTACK-9559  Why allow deleting zone without deleting the seconda…
 2017-06-06 16:16:10 +05:30
Rajani Karuturi 0dc55f1144 Merge pull request #1734 from SudharmaJain/cs-9567 
CLOUDSTACK-9567 Difference in the api call outputs for CAPACITY_TYPE_…
 2017-06-06 16:15:13 +05:30
Rajani Karuturi 44f38eae6a Merge pull request #1756 from yvsubhash/CLOUDSTACK-9585 
CLOUDSTACK-9585 UI doesn't give an option to select the xentools version
 2017-06-06 16:14:29 +05:30
Rohit Yadav e197652a28 CLOUDSTACK-9860: Fix stackoverflow issue 
Fixes issue caused to a PR-refactoring from #2108, reported by
@borisstoyanov

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2017-06-06 16:14:03 +05:30
Rajani Karuturi b9ddf5a9fe Merge pull request #1761 from yvsubhash/CLOUDSTACK-9592 
CLOUDSTACK-9592 Empty responses from site to site connection status a…
 2017-06-06 16:07:10 +05:30
Rajani Karuturi 2734e9ec94 Merge pull request #1776 from priyankparihar/CLOUDSTACK-9603 
CLOUDSTACK-9603: 'concurrent.snapshots.threshold.perhost' parameter should not accept String.
 2017-06-06 16:06:17 +05:30
Rajani Karuturi 02996fcabf Merge pull request #1779 from priyankparihar/CLOUDSTACK-9610 
CLOUDSTACK-9610: Disabled Host Keeps Being up status after unmanaging …
 2017-06-06 16:05:21 +05:30
Rajani Karuturi 321712bcaf Merge pull request #1841 from sateesh-chodapuneedi/pr-cloudstack-9684 
CLOUDSTACK-9684 Invalid zone id error while listing vmware zone
 2017-06-06 16:04:24 +05:30